lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
87,205 Commits 43 Branches 150 Tags 886 MiB
c2bb0431f0
Commit Graph

8163 Commits

Author SHA1 Message Date
Laurent Destailleur
0b48ffe3cd Removed not used var $useglobalvars 2020-05-27 11:38:28 +02:00
Laurent Destailleur
9aeb79e80c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-26 23:22:45 +02:00
Laurent Destailleur
e02aa4e41b FIX Default bank account was not loaded for document generation. 2020-05-26 23:22:14 +02:00
Laurent Destailleur
e4ef6334aa Look and feel v12 2020-05-25 14:08:36 +02:00
Laurent Destailleur
2595f571c7 Fix exclude credit note when searching situation invoice to use for next 2020-05-25 00:21:09 +02:00
Laurent Destailleur
aee6fce9f8 Fix remove bad use 2020-05-24 20:04:26 +02:00
gael.langlais
af5de05a31 Change some curly braces #13929 2020-05-23 13:38:50 +02:00
Laurent Destailleur
76823d3e39 Clean CSS, clean code 2020-05-21 20:59:02 +02:00
Laurent Destailleur
036617570e Doc 2020-05-20 23:46:48 +02:00
Laurent Destailleur
86ff60f161 Fix break line and set of opportunity fields 2020-05-15 15:50:50 +02:00
Laurent Destailleur
02b40ae8f6 Fix scrutinizer 2020-05-15 13:54:05 +02:00
Laurent Destailleur
ab07330668 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-14 16:34:45 +02:00
Laurent Destailleur
6ec5dd02b6 Fix Fatal error with bad triggers 2020-05-14 15:27:10 +02:00
Laurent Destailleur
ae0e6e4dc8 FIX dol_concatdesc to escape < 
Better help
 2020-05-14 14:30:36 +02:00
ATM john
9f6a5d4cc9 Fix multicompany supplier product price filter 2020-05-14 10:50:20 +02:00
Laurent Destailleur
ed68b73ef5
Merge pull request #13821 from atm-quentin/NEW_invoice_stat_graph_and_categ_search 
NEW Add invoice stat graph and categ search
 2020-05-12 03:31:09 +02:00
Laurent Destailleur
632ca40b1d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-12 03:04:59 +02:00
Laurent Destailleur
75cd7d7e72 Code comment 2020-05-12 03:04:48 +02:00
Frédéric FRANCE
097de7b3cd
Only add empty select if no multiselect 2020-05-11 18:34:54 +02:00
Laurent Destailleur
a8dcd2d09b Clean code 2020-05-11 11:53:13 +02:00
Laurent Destailleur
c511af69fe Debug look and feel v12 2020-05-10 21:07:49 +02:00
Laurent Destailleur
796f97c671 Support tag $capture in input of files 2020-05-10 15:08:01 +02:00
Laurent Destailleur
206b16410e Revert the option to avoid to introduce a feature that is duplicate with 
already existing view "Events/Agenda". It also keeps a common behaviour
between other tools.
Maxi debug on messages of tickets
 2020-05-07 22:52:32 +02:00
Laurent Destailleur
6c8d302dd9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/list.php
	htdocs/compta/prelevement/rejets.php
	htdocs/fourn/commande/index.php
 2020-05-07 12:03:49 +02:00
Laurent Destailleur
d6887f3ca4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/list.php
	htdocs/core/class/notify.class.php
 2020-05-07 11:59:13 +02:00
Laurent Destailleur
d4400cf80f FIX links into emails of notifications 2020-05-07 11:39:32 +02:00
atm-quentin
b6aa766c72 FIX stickler 2020-05-06 09:37:17 +02:00
Laurent Destailleur
30fede216c Fix Add '_pw' var as var sensibles. 2020-05-06 04:03:07 +02:00
atm-quentin
1b35380dda NEW stats invoice graph with 3 bars 2020-05-05 16:13:04 +02:00
Laurent Destailleur
7e6b5a384d Code comment 2020-05-05 15:16:30 +02:00
Laurent Destailleur
2afd38e2f6 FIX Combo list of available users to filter on the list of leaves. 2020-05-04 21:59:31 +02:00
Laurent Destailleur
6d894b7abd Fix missing link in message 2020-05-04 19:08:31 +02:00
Laurent Destailleur
4b34a6bd4a Look and feel 2020-05-04 12:43:47 +02:00
Laurent Destailleur
535ae612f3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-03 22:48:48 +02:00
Laurent Destailleur
4d6a45d491 Major doxygen fix 2020-05-03 22:48:35 +02:00
Marc Guenneugues
b5abb72c5b Add / as a delimiter for replacement pattern in select_produits* 2020-05-02 16:36:40 +02:00
Laurent Destailleur
48e62eca0c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-02 15:19:09 +02:00
Laurent Destailleur
a88ab40384 Clean phpcs 2020-05-02 15:18:59 +02:00
Laurent Destailleur
099871e217
Merge pull request #13649 from atm-john/12.0_add_class_unitstools 
NEW class tool for converting units
 2020-05-02 13:05:51 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-05-02 01:39:56 +00:00
Laurent Destailleur
aab9a2ff75 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-01 21:03:38 +02:00
Laurent Destailleur
b41b22996f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/utils.class.php
	htdocs/core/lib/files.lib.php
 2020-05-01 21:03:16 +02:00
Laurent Destailleur
385f998254 Fix restore param --quick 2020-05-01 21:01:40 +02:00
Frédéric FRANCE
fddbe7c929
$tmpplugin was defined after use 2020-05-01 07:50:46 +02:00
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
Laurent Destailleur
042fb4641f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/de_DE/install.lang
	htdocs/langs/de_DE/main.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/projects.lang
 2020-04-21 18:33:11 +02:00
Laurent Destailleur
7b99ebfca5 Debug generic translation of fields 2020-04-21 14:54:30 +02:00
Laurent Destailleur
ff5bf040e8 FIX text version of html emailing (removed the body style) 2020-04-21 11:19:27 +02:00
mattsidnell
9040c9680d
Removed whitespace 2020-04-20 23:44:23 +01:00
mattsidnell
3f42bfb40f
change 2020-04-20 23:42:12 +01:00
Matt Sidnell
59b574742b Update commonobject.class.php 2020-04-20 22:52:36 +01:00
Matt Sidnell
ea9f0097a2 Add default values for Create 
Added default extrafield values for html and text fields to prepopulate data on record create only.
 2020-04-20 22:42:13 +01:00
Frédéric FRANCE
9697085f12
remove debug 2020-04-20 15:36:08 +02:00
Laurent Destailleur
8d59ce2e03 Look and feel v12 2020-04-20 02:48:05 +02:00
Laurent Destailleur
fa056e59df Look and feel v12 2020-04-20 02:14:43 +02:00
Laurent Destailleur
7b68d4260c Fix permission on button 2020-04-19 15:50:32 +02:00
Laurent Destailleur
ae80b09327
Merge pull request #13598 from atm-maxime/new_fields_on_group 
New : refactor UserGroup module with new common way
 2020-04-18 16:26:58 +02:00
ATM john
f2435f6247 Move methods to cunits class 2020-04-18 16:08:26 +02:00
Laurent Destailleur
5c18404083 Move to jquery 4.0.13 with fix in reponsive 
Restore some files modified by error.
 2020-04-18 15:15:35 +02:00
Laurent Destailleur
8f7c3fc867 Fix: restore jselect2 4.0.5 (4.0.6 create troubles in responsive) 2020-04-18 14:39:02 +02:00
ATM john
09591d75f6 Sql write less do more... 2020-04-18 13:20:08 +02:00
ATM john
e915552ae1 New class tool for converting units 2020-04-18 13:12:11 +02:00
Laurent Destailleur
f23266e560 css 2020-04-18 11:40:26 +02:00
Laurent Destailleur
7c6c600225 CSS 2020-04-18 11:38:24 +02:00
Laurent Destailleur
965bdf733d FIX Can overwrite file if exists in file manager 2020-04-17 13:10:18 +02:00
Laurent Destailleur
024abe8b58 FIX Preview of svg files into file manager 2020-04-17 12:34:35 +02:00
Laurent Destailleur
162cd94138 FIX Keep sort order after deletion of a file into file manager. 2020-04-17 12:32:05 +02:00
Laurent Destailleur
1d0b532437 Fix css 2020-04-16 14:31:30 +02:00
Laurent Destailleur
a13215217e
Merge pull request #13604 from TobiasSekan/FixAtomFeeds 
FIX not working ATOM feeds
 2020-04-16 11:58:49 +02:00
Sekan, Tobias
84f7fe24fe Adress feedback 2020-04-16 10:49:39 +02:00
Laurent Destailleur
f7803247ab
Merge pull request #13610 from joseplluis/patch-6 
NEW bank account tags for invoice ODT template
 2020-04-16 00:49:17 +02:00
Scrutinizer Auto-Fixer
d021559b16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-15 22:42:57 +00:00
Laurent Destailleur
95cf8b6359 FIX Non expected switch from tab timesptent to tab tasks 2020-04-15 14:54:54 +02:00
Laurent Destailleur
e26124bf84 Clean code to make option TICKET_NOTIFICATION_EMAIL_TO easier to 
understand
 2020-04-15 12:57:33 +02:00
Maxime Kohlhaas
7fea2bc557 Update changelog + trigger name change for class UserGroup 2020-04-15 08:44:29 +02:00
stickler-ci
c047cd1608 Fixing style errors. 2020-04-14 20:55:58 +00:00
Josep Lluís
d41cb023eb
NEW bank account tags for invoice ODT template 
added tags object_bank_iban and object_bank_bic, useful for ODT invoices when a bank account is assigned
 2020-04-14 22:47:40 +02:00
Sekan, Tobias
3482d24ee7 Fix not working ATOM feeds 2020-04-14 10:45:52 +02:00
Maxime Kohlhaas
261e6cbc52 Fix delete extrafield test 2020-04-13 19:08:03 +02:00
Maxime Kohlhaas
2e004e93ea Commonobject : delete extrafields + syslog 2020-04-13 19:02:19 +02:00
Laurent Destailleur
76fd1fb105 FIX #12996 2020-04-13 16:13:02 +02:00
Laurent Destailleur
3740d59848 Look and feel v12 2020-04-13 04:14:28 +02:00
Laurent Destailleur
596ba8d679 Clean deprecated code. 2020-04-13 01:10:35 +02:00
Laurent Destailleur
5b8864b46e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
 2020-04-12 21:41:40 +02:00
Laurent Destailleur
46ccd61009 Fix phpcs 2020-04-12 21:38:23 +02:00
Laurent Destailleur
422e33a68b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ihm.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/stats/cabyprodserv.php
	htdocs/filefunc.inc.php
	htdocs/takepos/invoice.php
 2020-04-12 17:01:44 +02:00
Laurent Destailleur
697043bbd3
Update html.form.class.php 2020-04-12 16:47:56 +02:00
Laurent Destailleur
acab0200a6
Update html.form.class.php 2020-04-12 16:46:21 +02:00
Laurent Destailleur
7d430c08d0 Look and feel v12 2020-04-12 16:36:25 +02:00
Laurent Destailleur
6b16a3ad39 NEW Can check all events in one click in setup of audited events 2020-04-12 13:25:19 +02:00
TuxGasy
fecfe2e3a1 Keep compatibility with old object declaration 2020-04-11 18:37:06 +02:00
Laurent Destailleur
ca8e1f3ea5 NEW Can replace a string into all pages in website module 2020-04-11 18:18:53 +02:00
Laurent Destailleur
33a5288125 Add log 2020-04-11 16:34:59 +02:00
andreubisquerra
bcbd7632bf
Fix travis 2020-04-10 19:49:59 +02:00
jove@bisquerra.com
66659f0693 Two diferents order printers 2020-04-10 19:18:42 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
83af4ebea4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/product/stock/class/entrepot.class.php
	htdocs/product/stock/list.php
 2020-04-10 01:22:22 +02:00
Laurent Destailleur
09f1536c27
Merge pull request #13537 from andreubisquerra/master 
Add langs and print only no printed order lines
 2020-04-09 19:38:30 +02:00
Laurent Destailleur
3c9ca3860b
Merge pull request #13543 from atm-lena/11.0_FIX_hookmanager_typeAddReplace_completeTabsHead 
FIX - Add function "completeTabsHead" to "addreplace" type hook.
 2020-04-09 19:37:48 +02:00
Laurent Destailleur
6a60678186 Look and feel v12 2020-04-09 16:36:39 +02:00
atm-lena
c9ab61b521 FIX - Add function "completeTabsHead" to hooks "addreplace" 2020-04-09 14:54:47 +02:00