Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
78,589 Commits 36 Branches 189 Tags
594d9e321e8c7753932ca8ee98491036a3b51ec9
Commit Graph

17660 Commits

Author SHA1 Message Date
Christophe Battarel
545cdd0762 test include return on FALSE 2019-05-24 12:54:24 +02:00
Christophe Battarel
abc7c2f0f8 test include return on TRUE 2019-05-24 12:33:40 +02:00
Christophe Battarel
aaaad71347 FIX : do not include disabled modules tpl 2019-05-24 12:10:58 +02:00
Marc de Lima Lucio
49385fcab3 FIX: situation invoices: bad detailed VAT in situations following the first one 2019-05-23 14:37:40 +02:00
Laurent Destailleur
43e098caae Fix phpcs 2019-05-23 12:35:53 +02:00
Laurent Destailleur
111239094a Work to finish module BOM for v10 2019-05-22 20:28:24 +02:00
Laurent Destailleur
c8970c0283 Fix vat validator 2019-05-22 16:50:53 +02:00
Laurent Destailleur
fb95fe0606 Check vat is not case sensitive 2019-05-22 16:15:26 +02:00
Laurent Destailleur
2b90df6f80 Fix responsive 2019-05-22 16:08:21 +02:00
Laurent Destailleur
65acd6ef60 Fix function to check vat syntax 2019-05-22 15:48:07 +02:00
Laurent Destailleur
11bcfb4f5e Fix check on VAT syntax not visible on list 2019-05-22 15:37:59 +02:00
Laurent Destailleur
f99f1d83c2 Merge pull request #11229 from frederic34/patch-7 
target _blank depend of mime
 2019-05-21 22:42:36 +02:00
Laurent Destailleur
16f7d96ed1 Merge pull request #11231 from ATM-Marc/FIX_8.0_extrafields_search 
FIX: extrafield list search: SQL error when field is multiselect
 2019-05-21 22:38:14 +02:00
Laurent Destailleur
5707aff7c4 Look and feel v10 2019-05-21 21:52:04 +02:00
Laurent Destailleur
fdeb12a909 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/card.php
 2019-05-21 21:18:40 +02:00
Laurent Destailleur
a7f5f3fb94 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-21 21:16:54 +02:00
Laurent Destailleur
dcf77520ea FIX Error management when MAILING_NO_USING_PHPMAIL is set 2019-05-21 21:16:06 +02:00
Laurent Destailleur
22e897b1a1 Clean and prepare code to fix a SQL injection 2019-05-21 17:22:38 +02:00
Laurent Destailleur
657bd5c2fe Move module from develop to experimental 2019-05-21 15:50:16 +02:00
Laurent Destailleur
42f5ebed2d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/external_rss.php
	htdocs/admin/system/database-tables.php
	htdocs/admin/tools/export_files.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/lib/files.lib.php
	htdocs/core/lib/functions.lib.php
 2019-05-21 15:13:25 +02:00
Marc de Lima Lucio
18a6ed17cf FIX: extrafield list search: SQL error when field is multiselect 2019-05-21 14:49:23 +02:00
Laurent Destailleur
bea4647107 Fix auto swith on utf8 when using utf8mb4 2019-05-21 14:36:16 +02:00
Laurent Destailleur
f283e24b48 Fix the noexe must be added for dangerous extension like js and shells 2019-05-21 13:53:12 +02:00
Laurent Destailleur
eafc35b00f Look and feel v10 2019-05-21 13:27:45 +02:00
Frédéric FRANCE
84781cabac target _blank depend of mime 
target _blank is added in the previous line depending on mimtype
 2019-05-21 13:11:17 +02:00
Laurent Destailleur
ae3605d82d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/pdf.php
	htdocs/core/class/extrafields.class.php
 2019-05-20 15:47:06 +02:00
Laurent Destailleur
ebf252f8a3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-20 15:40:50 +02:00
Laurent Destailleur
ec922d3d17 Add CONTRACT_HIDE_PLANNED_DATE_ON_PDF and CONTRACT_HIDE_REAL_DATE_ON_PDF 2019-05-20 14:54:09 +02:00
Laurent Destailleur
c3732f2b7a Fix edition of margins in recurring invoices 2019-05-20 14:41:47 +02:00
Laurent Destailleur
3c1b860da4 Fix css 2019-05-20 12:16:39 +02:00
Laurent Destailleur
27ed095181 Debug BOM module 2019-05-19 16:40:25 +02:00
Laurent Destailleur
d86fc28aba Fix CSS 2019-05-19 13:01:11 +02:00
Laurent Destailleur
ea5ffbb0bf Merge pull request #11216 from atm-florian/8.0 
fix:  #11187
 2019-05-19 02:19:12 +02:00
Laurent Destailleur
2bbb04085e Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/modulebuilder/template/class/myobject.class.php
 2019-05-19 02:15:01 +02:00
Laurent Destailleur
71ef8c881b Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
 2019-05-19 02:06:20 +02:00
florian HENRY
e4d87ab2e7 fix: #11189 2019-05-19 02:05:13 +02:00
Laurent Destailleur
7738787729 Merge branch '7.0' of https://github.com/dolibarr/dolibarr into 8.0 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2019-05-19 02:03:16 +02:00
Maxime Kohlhaas
1d980342ec Fix #8344 2019-05-19 00:05:23 +02:00
Laurent Destailleur
41cb13b1cc Fix warning 2019-05-18 19:28:14 +02:00
Laurent Destailleur
4517d84e3a FIX Disable a module 2019-05-18 19:22:17 +02:00
Maxime Kohlhaas
4f64250ad6 Fix menu links for holidays 2019-05-18 17:12:25 +02:00
Maxime Kohlhaas
6c195d7bdf Add warning delay for holidays 2019-05-18 17:07:29 +02:00
Laurent Destailleur
94f5f6c655 Merge pull request #11207 from atm-john/FIX_scrutyniser 
FIX: scrutinizer feedback
 2019-05-18 16:05:24 +02:00
Laurent Destailleur
11fea03074 Merge pull request #11026 from atm-john/new_look_and_feel_title_button 
NEW : look and feel title button
 2019-05-18 16:04:47 +02:00
ATM John BOTELLA
f714b45efb FIX scrutinizer feedback 2019-05-18 15:53:07 +02:00
florian HENRY
9ef5767fd5 phpcs 2019-05-18 12:28:39 +02:00
florian HENRY
730820bb26 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-05-18 12:11:48 +02:00
florian HENRY
02af7ca25e fix pb with multicompny payment dictionnary on faxcture card 2019-05-18 12:11:28 +02:00
Laurent Destailleur
26d4875f8f Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop 2019-05-18 02:27:23 +02:00
Laurent Destailleur
6c4a4c34c4 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 2019-05-18 02:26:40 +02:00