Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
75,319 Commits 36 Branches 189 Tags
2bc93b9748604e474ee7d0f0e6421c424f996746
Commit Graph

6736 Commits

Author SHA1 Message Date
Laurent Destailleur
6557dcfb81 CSS 2018-12-23 00:49:26 +01:00
Laurent Destailleur
da3d1ab8b8 CSS 2018-12-23 00:24:10 +01:00
Laurent Destailleur
85375495e5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/public/notice.php
	htdocs/user/card.php
 2018-12-22 19:06:58 +01:00
Laurent Destailleur
94ee18a20a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-22 19:00:15 +01:00
Laurent Destailleur
8d39edf430 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/price.php
 2018-12-22 18:59:49 +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
33564ddafc Fix css 2018-12-22 16:45:57 +01:00
Laurent Destailleur
7d1b48815d Fix css 2018-12-22 11:57:23 +01:00
Regis Houssin
9b215e117a FIX check if "entity" is already defined in "$param" 2018-12-21 11:23:44 +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
2978522006 Merge pull request #10251 from ATM-Marc/FIX_7.0_contact_change 
FIX: contact/address tab issue when changing company
 2018-12-19 12:59:32 +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
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
f2318716ec FIX Error reported when creation of thirdparty from member fails 2018-12-18 21:27:16 +01:00
Philippe GRAND
7b84825d2b fix align issue 2018-12-18 17:30:24 +01:00
Marc de Lima Lucio
7e2eca661b FIX: contact/adress tab: when changing company ajax combo, the first contact change is not taken into account 2018-12-18 09:40:58 +01:00
Laurent Destailleur
e80e366fb1 Merge pull request #10187 from AlainRnet/patch-6 
Update vcard.class.php
 2018-12-15 15:59:34 +01:00
Laurent Destailleur
eb66d45947 Merge branch 'develop' into 10.0_accoutancy_stats 2018-12-15 15:17:15 +01:00
Laurent Destailleur
27f8096afa Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Laurent Destailleur
0cbc0fa0fc Fix shortkey 2018-12-14 19:33:43 +01:00
Laurent Destailleur
32f51838ec Merge pull request #10083 from aljawaid/aljawaid-improve_access_keys 
NEW: Improve Displaying Access Keys in Navigation
 2018-12-14 19:29:50 +01:00
Laurent Destailleur
d5bbb3033c Update html.form.class.php 2018-12-14 19:29:15 +01:00
Laurent Destailleur
f9c06cdb82 FIX #9498 #10132 2018-12-14 19:04:17 +01:00
Laurent Destailleur
59bc15377d CSS 2018-12-14 18:58:55 +01:00
Laurent Destailleur
0ac287c356 Merge pull request #10046 from frederic34/htmlformmail 
reduce complexity of htmlformmail class
 2018-12-14 17:37:34 +01:00
Laurent Destailleur
bd7df9869f Update html.formmail.class.php 2018-12-14 17:37:08 +01:00
Laurent Destailleur
4dc32dafaa Merge pull request #10043 from OPEN-DSI/selectcontacts-afterselectoptions-hook 
NEW Add afterSelectContactOptions hook
 2018-12-14 17:35:16 +01:00
Laurent Destailleur
89909ebab0 Update html.form.class.php 2018-12-14 17:32:41 +01:00
Laurent Destailleur
9fb672d51b Merge pull request #10127 from atm-florian/develop_scrunitizer 
fix scrunitizer
 2018-12-14 17:28:34 +01:00
Laurent Destailleur
7665c368a2 Merge branch 'develop' into allow_ajax_search_on_product_desc 2018-12-14 17:24:52 +01:00
Laurent Destailleur
88a52aa11d Merge branch 'develop' into develop_mc 2018-12-14 15:58:52 +01:00
Laurent Destailleur
59e38d4a81 Merge pull request #9897 from Vaadasch/develop 
NEW Update working chkbxlst filter for lists
 2018-12-14 15:33:50 +01:00
altatof
d5bf9691ee allow product ajax search on description 2018-12-14 15:10:32 +01:00
Laurent Destailleur
dc4a122697 Merge pull request #10224 from fmarcet/develop 
Qual: Better management of select type of lines
 2018-12-14 11:06:33 +01:00
Laurent Destailleur
8c9f81807f Merge pull request #9702 from bafbes/abb80027 
New : Link to create new element on linked fields
 2018-12-14 11:01:39 +01:00
Laurent Destailleur
42de7da334 Update commonobject.class.php 2018-12-14 11:01:27 +01:00
Laurent Destailleur
9bb3382002 Merge pull request #9534 from wdammak/patch-16 
Add the ability to sort products by category
 2018-12-14 10:02:08 +01:00
Laurent Destailleur
e1baf3ab2b Update html.form.class.php 2018-12-14 10:01:12 +01:00
Laurent Destailleur
5d5add641b Fix scrutinizer 2018-12-14 09:58:23 +01:00
Laurent Destailleur
4fc2cefce3 Merge pull request #10181 from aljawaid/aljawaid-override_vat_expense_report 
NEW: Add Hidden Config 'OVERRIDE_VAT_FOR_EXPENSE_REPORT'
 2018-12-13 20:53:32 +01:00
Laurent Destailleur
3484b50511 Update html.form.class.php 2018-12-13 20:51:45 +01:00
Laurent Destailleur
7a3ab13196 FIX #10183 using backport of fix done in 9.0 2018-12-13 20:45:51 +01:00
Laurent Destailleur
f97b561af0 Merge branch 'develop' into qual_rename_facnumber 2018-12-13 20:24:12 +01:00
Laurent Destailleur
860492a19f Merge pull request #10201 from joseplluis/patch-3 
Fix: add ID property to select objects
 2018-12-13 20:03:46 +01:00
Ferran Marcet
555698a3af Qual: Better management of select type of lines 2018-12-13 10:36:30 +01:00
Philippe GRAND
58175b76f2 to avoid html issue 2018-12-12 12:17:28 +01:00
Laurent Destailleur
434cf2e046 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-11 09:58:14 +01:00