Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
87,753 Commits 36 Branches 189 Tags
45f834cb15122c034e1666a03e920f159183d7dd
Commit Graph

8219 Commits

Author SHA1 Message Date
Laurent Destailleur
c27b3c5966 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
 2020-04-30 18:49:20 +02:00
Laurent Destailleur
82ace4b4ef FIX Several pb in export of documents 
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
 2020-04-30 11:52:30 +02:00
Laurent Destailleur
6ec6a4465a FIX Setup of thirdparty or contact for external users 2020-04-29 20:21:17 +02:00
Laurent Destailleur
908e5d7f0a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/api/class/api_setup.class.php
 2020-04-29 18:05:01 +02:00
Laurent Destailleur
84bca036c9 FIX Link missing into email of some notification 2020-04-29 18:03:28 +02:00
Laurent Destailleur
a0c013d87b Fix missing link 
Conflicts:
	htdocs/core/class/notify.class.php
 2020-04-28 19:18:31 +02:00
Laurent Destailleur
c22e13b138 FIX Avoid infinite loop when a fetch is inside a compute field. 2020-04-28 14:27:51 +02:00
Laurent Destailleur
a8740352af FIX Extrafields of type price must be '' and not '0' if not defined 2020-04-28 14:27:42 +02:00
Laurent Destailleur
dd3a5949c0 FIX Avoid infinite loop when a fetch is inside a compute field. 2020-04-28 14:25:07 +02:00
Laurent Destailleur
2b00ae9e92 FIX Extrafields of type price must be '' and not '0' if not defined 2020-04-28 14:22:52 +02:00
Laurent Destailleur
0de8cb7096 Add property shortlang 2020-04-27 18:38:11 +02:00
ATM john
41e597e739 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_add_class_unitstools 2020-04-27 17:46:22 +02:00
Laurent Destailleur
fe6fb12d18 Fix missing link 2020-04-27 17:13:23 +02:00
Laurent Destailleur
a7de160290 Merge pull request #13740 from simicar29/develop-hook-updateTotalPrice 
ADD: New hook updateTotalPrice in commonObject update_price
 2020-04-27 13:43:13 +02:00
Laurent Destailleur
4c605283f5 Fix phpcs 2020-04-27 00:09:21 +02:00
Laurent Destailleur
31157931a9 Fix phpcs 2020-04-26 23:52:23 +02:00
Laurent Destailleur
31ba277da7 Fix phpcs 2020-04-26 23:18:09 +02:00
Laurent Destailleur
b20d85b198 Fix phpcs 2020-04-26 23:06:52 +02:00
Laurent Destailleur
6caa872280 Enable more PHPCS rules 2020-04-25 19:27:42 +02:00
Laurent Destailleur
068a890c36 Enable more PHPCS rules 2020-04-25 19:13:20 +02:00
Laurent Destailleur
3090eb578b Look and feel v12 2020-04-25 17:43:12 +02:00
Laurent Destailleur
0aec776d82 Merge pull request #13737 from lecoqlibre/develop 
FIX CUnit->fetch id/rowid
 2020-04-25 13:53:16 +02:00
Scrutinizer Auto-Fixer
1bf5745286 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-25 11:52:07 +00:00
Marc Guenneugues
fb2759eaf6 Correct lint errors 2020-04-25 10:32:35 +02:00
Marc Guenneugues
966fedc501 ADD: New hook updateTotalPrice in commonObject update_price 2020-04-25 10:19:09 +02:00
Laurent Destailleur
d416edab1a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-24 22:50:09 +02:00
Laurent Destailleur
54d641020f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/accounting-files.php
 2020-04-24 22:49:59 +02:00
Maxime Lecoq
9ed7ff80a1 FIX CUnit->fetch id/rowid 2020-04-24 21:08:47 +02:00
Laurent Destailleur
d11dcc35c3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2020-04-24 19:56:19 +02:00
Laurent Destailleur
df10b86d1f FIX consistency of price w/wo vat wrong when price entered with tax 2020-04-24 19:52:34 +02:00
Laurent Destailleur
708f89c9dc Merge pull request #13732 from pstructures/new-devlelop 
Fixed Translation Issue Default Contact Address For Field
 2020-04-24 19:00:04 +02:00
stickler-ci
6d4d638ec1 Fixing style errors. 2020-04-24 12:38:46 +00:00
Tobias Sekan
05bb94cd3f fix wrong set e-mail for vCard + docu update 2020-04-24 14:12:43 +02:00
Matt Sidnell
dd070cc680 Update commonobject.class.php 2020-04-23 20:37:15 +01:00
Scrutinizer Auto-Fixer
548f3007cf Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-23 16:55:10 +00:00
florian HENRY
32385b75e1 travis 2020-04-23 16:18:31 +02:00
florian HENRY
7a206df96f Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2020-04-23 16:04:58 +02:00
Laurent Destailleur
68e9d8463a Debug MAIN_USE_ALTERNATE_TRANSLATION_FOR variable 2020-04-23 15:52:15 +02:00
florian HENRY
882b39628f fix: uniformize extrafeild replacemnt for ODT docs 2020-04-23 15:50:42 +02:00
Laurent Destailleur
86928efb95 Var not defined 2020-04-23 13:35:40 +02:00
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +02:00
ATM john
bf592489c0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_add_class_unitstools 2020-04-22 23:09:10 +02:00
Laurent Destailleur
ead78ae777 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-22 21:29:44 +02:00
Laurent Destailleur
de90f24bd4 Fix phpcs 2020-04-22 21:29:15 +02:00
Laurent Destailleur
39c454d07b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modFournisseur.class.php
 2020-04-22 18:28:52 +02:00
Laurent Destailleur
6b8ff56c20 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/html.formother.class.php
 2020-04-22 18:26:26 +02:00
Laurent Destailleur
496d8f354f Look and feel v12 2020-04-22 17:59:54 +02:00
gauthier
43f4c5ac96 FIX : model export list must be sorted by label 2020-04-22 15:29:54 +02:00
Laurent Destailleur
2541d41809 Merge pull request #13669 from pstructures/new-devlelop 
Add default values to extrafields
 2020-04-22 01:06:04 +02:00
Laurent Destailleur
770fca0b33 Debug the double language feature in pdf 2020-04-21 20:16:36 +02:00