Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-28 11:43:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 38 Branches 191 Tags
e3a0220658b7dfc05bfb499ace614fda170e4f3b
Commit Graph

7858 Commits

Author SHA1 Message Date
Laurent Destailleur
1a292839ca Fix regression in look and feel (if empty, we do not sho value) 2019-01-30 15:31:18 +01:00
Laurent Destailleur
17c3337c9b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-30 15:25:43 +01:00
Regis Houssin
39b696af02 FIX multicompany compatibility 2019-01-29 12:01:40 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
ff39491f15 wip 2019-01-27 23:31:37 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
4f9f0fd7b5 Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1 Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
f96d730943 Merge pull request #10391 from grandoc/new_branch_22_01_2019 
update with html5 compliant code
 2019-01-26 14:09:15 +01:00
Laurent Destailleur
adb7ec7015 Merge pull request #10399 from grandoc/new_branch_23_01_2019 
update with html5 compliant code
 2019-01-26 14:02:26 +01:00
Laurent Destailleur
e42fe4022a Uniformize lenght of small list 2019-01-25 15:22:36 +01:00
Philippe GRAND
6625dac8d7 update with html5 compliant code 2019-01-23 17:28:02 +01:00
Philippe GRAND
34b6f5705e update with html5 compliant code 2019-01-22 14:09:14 +01:00
Philippe GRAND
4668052f95 update with html5 compliant code 2019-01-22 14:04:33 +01:00
Laurent Destailleur
844643c37d Merge pull request #10375 from grandoc/new_branch_19_01_2019 
update with html5 compliant code
 2019-01-20 19:48:32 +01:00
Laurent Destailleur
300889f53a # WARNING: head commit changed in the meantime 
Fix
 2019-01-19 13:22:38 +01:00
Laurent Destailleur
55c90b0578 Fix #10359 cloning of proposal 2019-01-19 13:17:07 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
Philippe GRAND
66e4bc4502 update with html5 compliant code 2019-01-19 12:27:26 +01:00
Laurent Destailleur
5130019003 css 2019-01-17 19:27:26 +01:00
Philippe GRAND
bd929c2d1e update with html5 compliant code 2019-01-17 14:24:41 +01:00
atm-quentin
013c078c8b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice 2019-01-16 10:52:46 +01:00
Marc de Lima Lucio
1cfd52e7e2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_actionlist_desc 2019-01-09 12:08:55 +01:00
Marc de Lima Lucio
de7dfd3423 NEW: actioncomm list: add description column (hidden by default) 2019-01-09 11:54:03 +01:00
Laurent Destailleur
d929d93376 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-08 14:19:35 +01:00
Laurent Destailleur
acc665a9f1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2019-01-08 14:16:23 +01:00
Laurent Destailleur
1ee0d42408 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-08 14:08:22 +01:00
Marc de Lima Lucio
68802c659e FIX: action list: add printFieldListSelect and printFieldListWhere hooks 2019-01-08 11:41:58 +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
3af418349a FIX Can't empty the payment mode 2018-12-29 07:54:30 +01:00
ldestailleur
c0eef25b31 FIX Can set payment mode to empty on thirdparty page 2018-12-28 23:14:36 +01:00
ldestailleur
8ad06463e0 FIX Can set payment mode to empty on thirdparty page 2018-12-28 23:06:04 +01:00
Laurent Destailleur
a445e7597d FIX Popup when having notes of events 2018-12-27 06:37:17 +01:00
Laurent Destailleur
fadc9983dc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-27 06:18:03 +01:00
Laurent Destailleur
cd53e22d64 FIX Edit description of event 2018-12-27 06:16:54 +01:00
Laurent Destailleur
f55db6dd84 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/resources/dbmodel/dolibarr_schema.mwb
 2018-12-15 14:09:16 +01:00
Laurent Destailleur
e069da69ba Revert "Fix screen size fall" 
This reverts commit abb6b41f91.
 2018-12-15 12:35:37 +01:00
John BOTELLA
4fa10296f4 Fix screen size fall 2018-12-15 12:34:41 +01:00
Laurent Destailleur
dbe5d285e8 Merge pull request #9965 from atm-john/fix_responsive 
FIX screen size fall
 2018-12-15 12:33:35 +01:00
Laurent Destailleur
b511a056f4 Fix phpcs 2018-12-15 11:48:21 +01:00
Laurent Destailleur
baf9b6f309 Fix regression (bad name of function) 2018-12-14 19:21:19 +01:00
Laurent Destailleur
38ddfd9a62 Merge pull request #10152 from defrance/patch-134 
refactoring list.php with dol_sql_datefilter
 2018-12-14 19:06:29 +01:00
Laurent Destailleur
3571eaee3d Merge branch 'develop' into NEW_change_order_concat_desc 2018-12-14 17:44:08 +01:00
Laurent Destailleur
2011afe6fb Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
83efdee7d3 Merge branch 'develop' into new_mass_generate 2018-12-14 15:44:46 +01:00
Laurent Destailleur
611ccc4a9a Merge branch 'develop' into fieldlabel 2018-12-14 15:42:01 +01:00
Laurent Destailleur
233e160489 Merge pull request #9874 from atm-john/New_import_lines_from_linked_element_step2 
NEW Extend import option to Order's card and Propal's card
 2018-12-14 15:29:27 +01:00
Laurent Destailleur
5dabefe227 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-13 20:49:55 +01:00