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

2232 Commits

Author SHA1 Message Date
NextGestion
6f85cab6c4 Merge https://github.com/Dolibarr/dolibarr into dolibarr_partnership 2021-05-04 10:55:19 +01:00
Laurent Destailleur
92c1022b8e Fix duplicate in webp 2021-05-02 14:49:07 +02:00
Laurent Destailleur
8176898430 Fix lang 2021-05-02 14:31:03 +02:00
Laurent Destailleur
4e7e6048de Debug generation of webp 2021-05-01 15:42:49 +02:00
Laurent Destailleur
99d655b983 Debug generation of webp 2021-05-01 15:38:58 +02:00
Laurent Destailleur
575d335374 Debug generation of webp 2021-05-01 15:12:30 +02:00
Laurent Destailleur
de8e291c7e Debug v14 2021-04-29 10:01:10 +02:00
lmarcouiller
7782e849e2 changes to implement eldy's advices 2021-04-28 09:22:10 +02:00
lmarcouiller
758ba67adc Fix #17219 : new complement of PR 17161 2021-04-27 10:50:45 +02:00
lmarcouiller
080bd90c93 Fix #17219 : complement of PR 17161 2021-04-26 16:15:09 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Laurent Destailleur
18d87ae575
Merge pull request #17255 from Givriz/dev_1 
Compatibility phpv8
 2021-04-19 21:44:25 +02:00
Laurent Destailleur
e71e5d533d Fix HTML5 2021-04-19 21:30:25 +02:00
NextGestion
0d4a1d061a
Merge branch 'develop' into dolibarr_partnership 2021-04-16 11:01:08 +01:00
NextGestion
9304b3c474 Manage mass action "Send email" for Partnership module 2021-04-16 09:54:11 +01:00
Laurent Destailleur
b298420ac5 Fix bad test 2021-04-14 15:12:40 +02:00
Laurent Destailleur
a68a5b0c04 Look and feel v14 2021-04-14 15:11:26 +02:00
Laurent Destailleur
f54fd1063b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 19:39:08 +02:00
Givriz
bc78b87020 pvpv8 continuous integration 2021-04-13 16:32:19 +02:00
Laurent Destailleur
d09be1f86f Do not make new twice 2021-04-13 16:18:18 +02:00
Alexandre SPANGARO
44133166de Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
Laurent Destailleur
3d681d96c4
Merge pull request #17205 from DorianVabre/dev_EventOrganizer 
new: working on conference or booth object and event type #FoundationFunding
 2021-04-12 16:06:13 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Alexandre SPANGARO
87cc1b2601 Add right supplier_invoice 2021-04-12 07:37:34 +02:00
lmarcouiller
19ee78e123 Close #17193 : Move button convert in webp 2021-04-09 15:44:47 +02:00
Dorian Vabre
60341e8a14 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer 2021-04-08 17:29:16 +02:00
kamel
c06cc6d75a NEW : Add new permok for edit extrafields on contact card 2021-04-07 17:28:13 +02:00
Dorian Vabre
f7b6e239e9 nouvelle page attendee_subscription créée, lien ajouté sur la conferenceorbooth_card (non cliquable) 2021-04-07 10:06:38 +02:00
Laurent Destailleur
6057d8aabd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/login.tpl.php
 2021-03-29 21:37:21 +02:00
Florian HENRY
f87711bf2f Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-26 18:30:08 +01:00
Florian HENRY
e898fbb834 almost done 2021-03-24 21:21:53 +01:00
Laurent Destailleur
a5034d44f7 $_POST war 2021-03-24 19:53:31 +01:00
Laurent Destailleur
4ecd1def49 css 2021-03-24 11:00:26 +01:00
ATM john
4f693b86c2 shhhhhh ! There is nothing here... 2021-03-23 19:27:40 +01:00
Laurent Destailleur
70be2dbcf0 Fix regression in tests 2021-03-20 20:51:19 +01:00
Laurent Destailleur
2da85a9ca2
Merge pull request #16842 from hregis/fix_avoid_warning_php8 
FIX avoid php8 warning in products list
 2021-03-20 11:48:53 +01:00
Frédéric FRANCE
239dae03bf
fix php8 warnings 2021-03-19 16:57:12 +01:00
stickler-ci
ee701bb480 Fixing style errors. 2021-03-19 09:05:20 +00:00
Regis Houssin
a1f6886e97 FIX avoid php8 warning in products list 2021-03-19 10:01:40 +01:00
Laurent Destailleur
a200f6f6ea
Merge pull request #16785 from frederic34/fixextrafieldsadmin 
fix php8 warning
 2021-03-18 23:08:15 +01:00
Frédéric FRANCE
37fcaf2a57
fix php8 warning 2021-03-18 22:07:35 +01:00
Frédéric FRANCE
75cf5e3599
fix php8 warning 2021-03-17 23:55:46 +01:00
Regis Houssin
5fc40f2b12 FIX avoid php 8 warning 2021-03-17 14:32:25 +01:00
Florian HENRY
9d8254eff4 fix price output in commoncard 2021-03-16 09:59:45 +01:00
Frédéric FRANCE
e8b994ece5
fix php8 warning 2021-03-15 00:40:10 +01:00
Laurent Destailleur
0a0bb92689 Fix phpcs 2021-03-06 11:37:23 +01:00
Laurent Destailleur
3cbced439a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/compta/bank/line.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/paiement/cheque/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/ticket.lib.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/cron/list.php
	htdocs/expedition/card.php
	htdocs/mrp/mo_list.php
	htdocs/product/stock/productlot_card.php
	htdocs/public/emailing/mailing-read.php
	htdocs/public/emailing/mailing-unsubscribe.php
	htdocs/ticket/list.php
	test/phpunit/FactureRecTest.php
 2021-03-05 19:29:09 +01:00
Laurent Destailleur
ffa0e6c391 FIX Timezone management for datetime on list of events 2021-03-04 15:34:29 +01:00
Laurent Destailleur
aa1551bf1f FIX class not found when creating recuring invoice from invoice+discount 2021-03-03 22:46:25 +01:00
Frédéric FRANCE
a4e25359e7
add missing rule 2021-03-01 20:37:16 +01:00
Laurent Destailleur
a6bc218280 Look and feel v14 2021-02-28 21:34:27 +01:00
Laurent Destailleur
886cbc61c8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/boxes/box_factures_fourn.php
	htdocs/core/boxes/box_factures_fourn_imp.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/boxes/box_members.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2021-02-28 13:37:45 +01:00
Laurent Destailleur
1149de1aca FIX #16485 2021-02-28 13:15:24 +01:00
Laurent Destailleur
5c0ea476e1 Look and feel v14 2021-02-27 12:45:07 +01:00
Frédéric FRANCE
554e449e40
code syntax core directory 2021-02-23 22:03:23 +01:00
Laurent Destailleur
2673e93dfc
Update card_presend.tpl.php 2021-02-22 11:19:47 +01:00
Daniel
7bbf1b4841 Fix Formatting 2021-02-22 10:04:29 +01:00
Daniel
38e1264588 For more flexible salutation in some languages the folloing Variables 
are availible

__CONTACT_LASTNAME_XXX__
__CONTACT_FIRSTNAME_XXX__
__CONTACT_SALUTATION_XXX__
 2021-02-22 09:56:48 +01:00
Laurent Destailleur
efb32c7d0b Fix test pages 2021-02-19 15:06:36 +01:00
Laurent Destailleur
fd5fe5b427 Look and feel 2021-02-15 14:38:28 +01:00
Laurent Destailleur
7e7d393f30 Look and feel v14 2021-02-15 14:19:05 +01:00
Laurent Destailleur
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
 2021-02-15 13:12:27 +01:00
Laurent Destailleur
49f8ff5708 FIX #16286 2021-02-15 12:18:09 +01:00
Laurent Destailleur
ee6bc80242 Fix phpcs 2021-02-11 01:59:13 +01:00
Laurent Destailleur
88550ab417 Look and feel v14 2021-02-10 18:03:45 +01:00
Laurent Destailleur
c875ad9a1c FIX #16240 2021-02-10 02:17:01 +01:00
Laurent Destailleur
afeeb40e2e Fix show property "enabled" of extrafields 2021-02-10 00:18:00 +01:00
Laurent Destailleur
0a2ace81ff Fix phpcs 2021-02-09 18:15:32 +01:00
Laurent Destailleur
5e9065390a
Merge pull request #16228 from FHenry/dev_new_autoload_product_extrafield_line_createtpl 
NEW:add hidden option to auto load input line extrafield into new lines
 2021-02-09 13:24:53 +01:00
Laurent Destailleur
401b4f641d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
 2021-02-08 22:13:50 +01:00
Florian HENRY
1e6144a99d fix indent 2021-02-08 19:59:18 +01:00
Florian HENRY
b6b736c402 NEW:add hidden option to auto load input line extrafield into new lines 2021-02-08 19:56:34 +01:00
Laurent Destailleur
6892ad9630 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
 2021-02-08 17:25:05 +01:00
Raphael Schweizer
0be168561f prevent browsers from storing / suggesting old captchas 2021-02-06 16:10:05 +01:00
Laurent Destailleur
c441b54521 NEW If not logo defined, can use squarred logo on login page 2021-02-05 12:07:39 +01:00
atm-lena
c5f73ec12a Resolve ret 2021-02-04 10:42:42 +01:00
atm-lena
e9b5a52a4f Add hidden conf to display supplier in object lines 2021-02-03 15:22:04 +01:00
Laurent Destailleur
2e7de1d137 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	test/phpunit/ExportTest.php
 2021-02-02 16:17:53 +01:00
Laurent Destailleur
c5201b95bb FIX Must not be able to edit vat of all lines if not draft 2021-02-02 16:12:03 +01:00
Laurent Destailleur
4d029194d3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/ajax.lib.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
 2021-02-02 13:22:23 +01:00
Laurent Destailleur
b80de4aeaf FIX CSRF errors on margin forms 2021-02-02 13:04:41 +01:00
Laurent Destailleur
e6deed1601 Fix collapse 2021-02-01 15:40:59 +01:00
Laurent Destailleur
113ef1a02b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/class/user.class.php
 2021-01-19 16:21:53 +01:00
Laurent Destailleur
2baeec1537
Merge pull request #15964 from FHenry/12.0 
extrafeild selllist can be use with string fk
 2021-01-18 18:53:01 +01:00
Florian HENRY
58eeb7152b Merge branch '12.0' into 13.0 2021-01-18 09:19:05 +01:00
Florian HENRY
c4f8e81d5d better fix 2021-01-18 09:18:42 +01:00
Florian HENRY
33a0cf078c better fix 2021-01-18 09:12:23 +01:00
Florian HENRY
014d3cc114 better fix 2021-01-18 09:08:54 +01:00
Laurent Destailleur
2859070c5c Fix filet on extrafields date 2021-01-17 15:47:43 +01:00
Laurent Destailleur
2f69a380be Fix syntax error 2021-01-16 16:06:49 +01:00
Laurent Destailleur
68302d74ba Fix look and feel v14 2021-01-16 14:10:37 +01:00
kevin
fb14f7c0b8 Modify GETPOST parameters to match with v12 2021-01-15 14:40:55 +01:00
Florian HENRY
cd62c9ed6d Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-01-15 08:11:30 +01:00
Laurent Destailleur
aaddda9a6e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/user/class/usergroup.class.php
 2021-01-14 14:13:08 +01:00
Florian HENRY
1cc88794b5 merge from 12.0 because this bug comme from it 2021-01-12 21:48:34 +01:00
Florian HENRY
34b792e9a2 betterfix 2021-01-12 21:44:18 +01:00
Laurent Destailleur
958b255822 Fix #15949 by introducing 'alphawithlgt' as GETPOST possible param. 2021-01-12 21:06:02 +01:00
Florian HENRY
f30b303269 Merge branch '12.0' into 13.0 2021-01-12 17:45:54 +01:00
Florian HENRY
5b21702508 extrafeild selllist can be use with string fk 2021-01-12 17:44:22 +01:00
Laurent Destailleur
c2187b2ff1
Merge branch 'develop' into develop_new_workstation 2021-01-11 17:59:13 +01:00
Laurent Destailleur
238fd5accb
Merge pull request #15346 from ATM-Consulting/FIX_12.0_date_extrafields_are_not_filterable_on_lists 
NEW Can filter on extrafields date on lists
 2021-01-11 16:41:01 +01:00
Laurent Destailleur
9962c182c4
Merge pull request #15805 from FHenry/dev_exfields_of_lines_into_line_tr 
NEW : Extrafields of documents lines are inside the lines, not any more on separate TR
 2021-01-11 16:15:45 +01:00
Laurent Destailleur
5660159a6d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/bom/bom_card.php
 2021-01-11 13:13:26 +01:00
Laurent Destailleur
c10072ccef Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-11 13:07:31 +01:00
Gauthier PC portable 024
8dfb088fc5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_workstation 2021-01-11 10:34:38 +01:00
Florian Mortgat
d7d44e22e3 FIX warning when filtering on date extrafield (cannot concatenate array to string) 2021-01-08 10:30:39 +01:00
Florian Mortgat
6a759b4bd0 Merge branch 'refs/heads/develop' into FIX_12.0_date_extrafields_are_not_filterable_on_lists 2021-01-08 09:21:58 +01:00
Florian Mortgat
5418fcd5be [minor fix] remove useless intval() 2021-01-08 09:05:32 +01:00
Laurent Destailleur
6da3ed1a51 Merge 2 exclusive options into 1 2021-01-07 12:39:51 +01:00
Laurent Destailleur
26fa8b45ac
Merge pull request #15153 from FHenry/dev_new_add_desc_when_select_product 
NEW: preload product description on selection for customer propal/order/invoice
 2021-01-07 11:19:53 +01:00
Laurent Destailleur
a1d20ed9c2
Merge pull request #15910 from atm-john/new/unit_type_selection_limit 
NEW unit selection on object edit line
 2021-01-07 10:33:07 +01:00
Laurent Destailleur
312f11d7b3
Update objectline_edit.tpl.php 2021-01-07 10:30:11 +01:00
Maxime Kohlhaas
1b7d194e18 Finish fix on add form values 2021-01-07 09:03:25 +01:00
Laurent Destailleur
8918299364
Update commonfields_add.tpl.php 2021-01-06 21:24:37 +01:00
Maxime Kohlhaas
42e45d4a7a Fix date and datetime type in commonfield_add.tpl 2021-01-06 21:14:40 +01:00
ATM john
7fb0eb5756 fix stickler 2021-01-06 17:34:04 +01:00
ATM john
dd19da66b2 fix stickler 2021-01-06 17:33:19 +01:00
ATM john
ae7b8e7f5e Fix unit selection on object edit line 2021-01-06 15:15:51 +01:00
Regis Houssin
f80a476bc5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-06 11:37:56 +01:00
Florian HENRY
27c32560c6 Merge develop 2021-01-05 14:46:50 +01:00
Laurent Destailleur
a93227ac2f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 11:30:25 +01:00
Laurent Destailleur
ed25b252b9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 11:30:14 +01:00
Regis Houssin
ec6c14beb8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-05 09:41:52 +01:00
Florian HENRY
86075a4db9 review code 2021-01-04 20:00:57 +01:00
Florian HENRY
88ff52a82b Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_exfields_of_lines_into_line_tr 2021-01-04 19:20:34 +01:00
Laurent Destailleur
07a3367f52
Merge pull request #15624 from StephaneLesage/edit-extrafield-computed-multiline 
Create/Edit extra-field computed value with multi-line text area
 2021-01-04 15:57:50 +01:00
Laurent Destailleur
7141fa315e Debug v13 2021-01-04 15:32:18 +01:00
Florian HENRY
dfaf77b03f merge develop 2021-01-03 15:14:34 +01:00
Florian HENRY
b6d91526ee Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into dev_exfields_of_lines_into_line_tr 2021-01-02 17:58:34 +01:00
Regis Houssin
e36ae4ac90 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-02 13:14:30 +01:00
Laurent Destailleur
b88ee6eff4
Merge pull request #15815 from FHenry/dev_add_tag_on_massaction 
NEW: Add mass action add tag for product/service, user, thirdparty, warehouse, project, bank account, members
 2021-01-01 21:36:15 +01:00
Laurent Destailleur
e4600b2091 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-31 15:17:03 +01:00
Laurent Destailleur
9e8c6eb0a1 FIX #15849 2020-12-31 15:05:17 +01:00
Regis Houssin
aec01a95fc FIX again and again 2020-12-29 17:48:52 +01:00
Regis Houssin
20cd9cbbc7 FIX avoid warning php 8.0 2020-12-29 16:25:29 +01:00
Florian HENRY
b3dae016af fix sticker 2020-12-28 21:38:17 +01:00
Florian HENRY
1e438b686e fix stickler 2020-12-28 21:32:46 +01:00
Florian HENRY
806b40662f merge develop 2020-12-28 21:15:25 +01:00
Laurent Destailleur
1546805b9e
Merge pull request #15500 from frederic34/patch-10 
NEW add db fields note_public note_private for ecm
 2020-12-27 15:07:51 +01:00
Florian HENRY
720539ff46 on goung 2020-12-23 23:52:43 +01:00
Florian HENRY
26d3ea2227 on going 2020-12-23 23:32:50 +01:00
Laurent Destailleur
d65dc85a10 FIX for php 8 2020-12-23 19:16:25 +01:00
Laurent Destailleur
8e839a34e2 FIX for php 8 2020-12-23 19:14:47 +01:00
Florian HENRY
0c8939f46c modifié : htdocs/core/tpl/objectline_create.tpl.php 
modifié :         htdocs/core/tpl/objectline_edit.tpl.php
 2020-12-22 22:00:51 +01:00
Florian HENRY
fefc9040ab NEW : Display extrafields (for lines/det into line tr instead of ugly other tr 2020-12-22 12:52:01 +01:00
Gauthier PC portable 024
7b739920a2 NEW : Workstations management 2020-12-21 12:28:45 +01:00
Stephane Lesage
695eacf099 Create/Edit extra-field with multi-line text area for computed value 2020-12-15 19:52:55 +01:00
Laurent Destailleur
8114e86cf9 Fix phpcs 2020-12-14 13:40:30 +01:00
Laurent Destailleur
107e58403a Fix position of captcha 2020-12-14 12:54:54 +01:00
Laurent Destailleur
fa05982a8b Fix CSS v13 2020-12-12 18:37:51 +01:00
Laurent Destailleur
10a0c98f94 Debug v13 2020-12-09 19:26:41 +01:00
Frédéric FRANCE
a2eab824c1
Merge remote-tracking branch 'upstream/develop' into patch-10 2020-12-04 20:42:22 +01:00
Laurent Destailleur
dd54d28dc6 Debug v13 2020-12-03 10:13:13 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Laurent Destailleur
2707c0b89b Look and feel v13 2020-11-30 20:13:42 +01:00
Laurent Destailleur
3443174f67 Sync transifex 2020-11-30 18:28:04 +01:00
Laurent Destailleur
958893228a Fix combo to add contact and status of contact on popup 2020-11-30 15:18:58 +01:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
Laurent Destailleur
6c65ebef0d Look and feel v13 2020-11-29 15:16:53 +01:00
Frédéric FRANCE
1704de39bb
Merge remote-tracking branch 'upstream/develop' into patch-10 2020-11-27 11:18:04 +01:00
Laurent Destailleur
3588781180 Debug v13 2020-11-26 14:15:20 +01:00
Laurent Destailleur
74605cec12 Fix warning 2020-11-25 18:07:52 +01:00
Frédéric FRANCE
66ad0e5b13
add note on ecm files 2020-11-24 18:54:59 +01:00
Laurent Destailleur
5fb3564bc0
Merge pull request #15467 from hregis/develop_bug2 
FIX missing "enabled" value of extrafield after update
 2020-11-23 22:18:02 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +01:00
Regis Houssin
fe5dfab4be Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_bug2 2020-11-22 09:16:33 +01:00
Laurent Destailleur
a30e842521 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-21 23:48:34 +01:00
Laurent Destailleur
73a3a03398 Fix for smartphone 2020-11-21 23:36:20 +01:00
Regis Houssin
bd8faae9c1 FIX missing "enabled" value of extrafield after update 2020-11-20 15:59:50 +01:00
Givriz
c48129e279 Ajout de la class "button-save" 
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
 2020-11-19 20:23:38 +01:00
Florian HENRY
46326d7659 merge from develop 2020-11-19 13:53:34 +01:00
Laurent Destailleur
83eaf16a22 Fix css 2020-11-18 16:23:08 +01:00
Laurent Destailleur
8d8f0026c2 Fix switch date to datetime 2020-11-18 13:06:30 +01:00
Laurent Destailleur
548a25b005 Fix use of token 2020-11-16 14:36:23 +01:00
Christian Foellmann
2061d0f858 fix new company in contacts template file 2020-11-12 14:03:18 +01:00
Florian Mortgat
952f398a60 Apply stickler CI recommendation to avoid concatenating string literals 2020-11-10 23:50:42 +01:00
Florian Mortgat
2c1d4049be Enable list filtering on date and datetime extrafields 2020-11-10 17:24:17 +01:00
Laurent Destailleur
6536208a14
Merge pull request #15322 from OPEN-DSI/new-list-include-array-extra-fields-with-langfile 
NEW include tpl for loading lang file for extra fields in list
 2020-11-10 14:42:21 +01:00
lvessiller
279b4309b9 NEW include "extrafields_list_array_fields" tpl in module builder 2020-11-09 08:51:11 +01:00
Laurent Destailleur
da6c6c9e0a Clean code 2020-11-08 14:39:20 +01:00
lvessiller
4ddff7173f NEW include tpl for loading lang file for extra fields in list 2020-11-06 12:19:45 +01:00
Laurent Destailleur
1d9aacc7da Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commoninvoice.class.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
 2020-11-05 09:51:28 +01:00
Laurent Destailleur
a5328f4230 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-05 09:43:28 +01:00
Laurent Destailleur
6bb598498e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-11-05 09:42:51 +01:00
Florian Mortgat
400acf9f65 FIX - 10.0 - regex to remove 'action' parameter: taking feedback from PR#15213 into account 2020-11-02 08:26:36 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Laurent Destailleur
d4daf8b9ce Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/security2.lib.php
 2020-10-30 05:59:45 +01:00
Laurent Destailleur
5504e3b236 Fix phpcs 2020-10-30 05:58:40 +01:00
Laurent Destailleur
b3333da5c1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/main.inc.php
 2020-10-30 04:39:41 +01:00
Laurent Destailleur
ec0c8e0c79 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/tpl/advtarget.tpl.php
 2020-10-30 03:35:40 +01:00
Laurent Destailleur
263b679af4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/tpl/advtarget.tpl.php
 2020-10-30 03:31:04 +01:00
Florian Mortgat
5e2962ef38 FIX - 10.0 - remove 'action' parameter from redirect URL when reordering lines on a document 2020-10-29 10:50:13 +01:00
stickler-ci
88b570926f Fixing style errors. 2020-10-28 15:38:31 +00:00
Florian HENRY
d77a0b40a8 tested and approuve feaure #15036 2020-10-28 16:37:41 +01:00
Florian HENRY
a3073be8e4 Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product 2020-10-28 08:52:29 +01:00
Laurent Destailleur
1b939ab8f4
Merge pull request #15183 from frederic34/dol_fiche_end 
end of dol_fiche_end
 2020-10-27 19:00:32 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Laurent Destailleur
80d13e711c More secured getURLContent method. Add PHPUnit on getURLContent 2020-10-27 18:02:05 +01:00
Laurent Destailleur
2340cb654d
Merge pull request #15149 from defrance/patch-160 
Display application Title if filled on login page
 2020-10-26 19:32:42 +01:00
Laurent Destailleur
680f4f9fee
Update login.tpl.php 2020-10-26 19:32:21 +01:00
stickler-ci
a53e907706 Fixing style errors. 2020-10-26 15:32:00 +00:00
Florian HENRY
76824c868b clean get price for fourn and labal for supplier coducment 2020-10-26 16:31:07 +01:00
quentin
fd1f5bbe01 FIX table making extrafield too small advtagertmailing 2020-10-26 15:03:32 +01:00
quentin
5694a19c6a FIX table making extrafield input too small advtargetmailing 2020-10-26 14:51:13 +01:00
Florian HENRY
7c2b5b614f NEW: preload product description on selection for customer propal/order/invoice 2020-10-25 19:13:09 +01:00
Frédéric FRANCE
f2d21d68d6
selectTypeContact return void 2020-10-25 18:23:00 +01:00
BENKE Charlene
3efcb0dfeb
Display application Title if filled on login page 2020-10-25 16:19:16 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of 
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
 2020-10-25 16:01:18 +01:00
Laurent Destailleur
d042562996 Disable browser notification on public pages 2020-10-25 13:48:08 +01:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
0616b9bc9b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/compta/prelevement/line.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/functions2.lib.php
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2020-10-22 17:55:38 +02:00
Laurent Destailleur
a17c391efe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/product/composition/card.php
 2020-10-22 17:38:48 +02:00
Laurent Destailleur
cfcac7e053 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/lib/functions2.lib.php
 2020-10-22 17:34:48 +02:00
Laurent Destailleur
9775728b7d
Merge pull request #15091 from ATM-Consulting/fix/12.0_object_thirdparty_not_always_fetched_on_presend_action_from_order 
FIX 12.0 - third party of object is not always fetched when initiating an e-mail presend form
 2020-10-22 15:43:31 +02:00
Laurent Destailleur
d521ad6db4
Update objectline_edit.tpl.php 2020-10-22 15:11:54 +02:00
Laurent Destailleur
46a31f443d
Update objectline_create.tpl.php 2020-10-22 15:11:01 +02:00
Florian Mortgat
56db7d6c64 FIX: also check if there is a method $object->fetch_thirdparty() before calling it 2020-10-22 15:09:48 +02:00
Florian Mortgat
509819c119 FIX 12.0 - third party of object is not always fetched when initiating the e-mail presend action (e.g. from an order) 2020-10-21 23:19:29 +02:00
Florian HENRY
0a9293c9c6 fix token CSRF check for getSupplierPrice ajax call 2020-10-21 20:40:53 +02:00
Laurent Destailleur
f2fafe04b6 Update doc 2020-10-17 18:16:03 +02:00
Laurent Destailleur
fb3d18f962
Merge pull request #14658 from OPEN-DSI/v10-fix-extrafields-sellist-linked-options-load 
FIX load default linked options for linked sellist extra fields
 2020-10-17 18:13:13 +02:00
Aurélien
b6283c1a5d
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery 2020-10-08 16:19:10 +02:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-07 13:01:28 +00:00
Laurent Destailleur
459ebe2e56 css 2020-10-06 17:26:55 +02:00
AurelienBinard
39d538befc
Merge branch 'develop' into translateModLivraison2ModDelivery 2020-10-06 16:20:25 +02:00
Aurélien
f954e8b173
:mod livraison rename user acces right #14697 2020-10-06 16:10:48 +02:00
Laurent Destailleur
254d9edbb9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-06 13:18:58 +02:00
Laurent Destailleur
a68ba1704b Fix phpcs 2020-10-05 02:25:57 +02:00
Laurent Destailleur
63415e9728 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_commandes.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/boxes/box_shipments.php
	htdocs/core/boxes/box_supplier_orders.php
	htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
	htdocs/core/tpl/objectline_edit.tpl.php
 2020-10-04 23:27:52 +02:00
Laurent Destailleur
ca16606b4f Fix phpcs 2020-10-04 23:21:24 +02:00
Laurent Destailleur
f764b36a64 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-03 14:53:22 +02:00
Laurent Destailleur
5ed7b43214 phpcs 2020-10-03 14:48:19 +02:00
Laurent Destailleur
d482594499 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-02 14:45:20 +02:00
Laurent Destailleur
88714cfb18 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-02 14:44:23 +02:00
Laurent Destailleur
cee28d0253 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-02 14:43:54 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
879d041398 Can force the typeof check of GETPOST into $fields for type text. 2020-09-29 20:48:40 +02:00
lvessiller
1b5a0ce3bf FIX uses price2numjs 2020-09-28 17:04:20 +02:00
Laurent Destailleur
6e2a9dc0c9 Fix error management in Stripe 2020-09-24 21:54:21 +02:00
Laurent Destailleur
bb10379768 NEW Can change a product in line of recurring invoice or contract 2020-09-23 18:45:19 +02:00
Laurent Destailleur
c61e8f052b NEW Add property cssview when declaring fields of an object 2020-09-22 08:54:40 +02:00
Laurent Destailleur
f62d52f89a Fix tooltip for linkto object. 
Fix security of ajax selectobject.php
 2020-09-19 00:44:47 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
e5191cad24 Move code of incoterm into the Incoterm Trait. 2020-09-16 02:50:18 +02:00
Laurent Destailleur
7a28972c8a FIX sign of amount of invoice lines for credit note with multicurrency 
FIX Add INVOICE_POSITIVE_CREDIT_NOTE_SCREEN to solve PT requirement
 2020-09-15 11:18:21 +02:00
Laurent Destailleur
f626bd70d0 Look and feel v13 2020-09-14 20:53:42 +02:00
Laurent Destailleur
7ca9fd9dce Fix merge 2020-09-14 03:49:31 +02:00
Laurent Destailleur
59bc8ee07c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/stats/byproperties.php
	htdocs/adherents/stats/geo.php
	htdocs/admin/system/dolibarr.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_title.tpl.php
	htdocs/langs/en_US/admin.lang
	htdocs/product/class/product.class.php
 2020-09-14 02:49:19 +02:00
Laurent Destailleur
c3ba8f7843 Better translation 2020-09-14 02:13:27 +02:00
Laurent Destailleur
b8fe2188a6 Standardize code around model_pdf 2020-09-10 01:49:09 +02:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00
Laurent Destailleur
c91338198d Add some fields in candidature 
Look and feel v13
 2020-09-08 01:53:37 +02:00
lvessiller
86ce4315be FIX load default linked options for linked sellist extra fields 2020-09-07 15:19:58 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
Laurent Destailleur
b600478a5a Work on recruitment module 2020-08-23 22:11:16 +02:00
Laurent Destailleur
23cda5f464 Enhance recruitment module 2020-08-22 14:37:09 +02:00
Laurent Destailleur
220fc6db98 Work on recruitment module 2020-08-21 13:00:12 +02:00
Laurent Destailleur
c407a19563 Remove type= from script tags 2020-08-16 22:03:11 +02:00
Laurent Destailleur
73c1184195 Fix phpcs 2020-08-14 13:23:41 +02:00
Laurent Destailleur
d8c6e17efd Fix travis 2020-08-14 11:59:51 +02:00
lvessiller
39a422ef94 FIX update margins rates on object line edit 2020-08-14 11:48:53 +02:00
Laurent Destailleur
a2f50770f8
Merge pull request #14449 from cfoellmann/default-unit 
set default unit to `PRODUCT_USE_UNITS` value
 2020-08-14 03:04:09 +02:00
Laurent Destailleur
f0046672fc
Merge pull request #14461 from atm-john/NEW_fill_service_dates 
NEW: new line template: hidden conf to fill service dates from the last service line
 2020-08-14 02:50:24 +02:00
stickler-ci
ef78b85062 Fixing style errors. 2020-08-11 10:42:27 +00:00
John Botella
47e664df8d Merge tag 'develop' of github.com:Dolibarr/dolibarr into NEW_fill_service_dates 2020-08-11 12:28:40 +02:00
stickler-ci
3e168f9495 Fixing style errors. 2020-08-10 14:06:22 +00:00
Christian Foellmann
821e7e2894 set default unit to PRODUCT_USE_UNITS value 2020-08-10 15:39:05 +02:00
Laurent Destailleur
4c1aa25b32 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/admin/adherent_emails.php
	htdocs/core/tpl/extrafields_list_search_title.tpl.php
	htdocs/product/traduction.php
 2020-08-04 13:51:11 +02:00
Laurent Destailleur
39a5583930 FIX #14146 2020-08-04 13:32:26 +02:00
Laurent Destailleur
7149cbb532 NEW Add public note on products. This also partially fix the #14342 2020-08-02 17:09:21 +02:00
Laurent Destailleur
be34a2c607 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/cashdesk.lang
	htdocs/product/stock/list.php
 2020-08-02 16:06:51 +02:00
Laurent Destailleur
0bf678e09e Fix label of extrafields 2020-07-30 14:57:33 +02:00
Laurent Destailleur
618c85ceb1 FIX Filter too large for extrafields with type text or html 2020-07-30 14:49:31 +02:00
Laurent Destailleur
91a50038ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/fiche-stat.php
 2020-07-27 19:35:34 +02:00
Laurent Destailleur
6d8060bc50 FIX DO not erase variable $key and $label during output of extrafields 
Conflicts:
	htdocs/core/tpl/extrafields_view.tpl.php
 2020-07-27 14:22:55 +02:00
Laurent Destailleur
10484ba06e FIX DO not erase variable $key and $label during output of extrafields 2020-07-27 14:04:41 +02:00
Laurent Destailleur
e3126ec999 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/multicurrency/class/multicurrency.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-07-25 00:22:47 +02:00
Laurent Destailleur
1bd00ac775 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-25 00:17:36 +02:00
Laurent Destailleur
960416f9bf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/card.php
 2020-07-25 00:17:28 +02:00
Laurent Destailleur
943e7c988f
Update extrafields_list_print_fields.tpl.php 2020-07-24 12:55:12 +02:00
stickler-ci
8273dbcd49 Fixing style errors. 2020-07-24 08:39:09 +00:00
Frans Bosman
94498b191b
Update card_presend.tpl.php 2020-07-24 10:37:19 +02:00
quentin
7bc683b234 FIX warning 2020-07-22 15:13:50 +02:00
Frans Bosman
e2592d9049
Update card_presend.tpl.php 
Add hidden options for specific sender email-adress for Invoices, Shipments and Order-confirmations
 2020-07-22 11:44:26 +02:00
Laurent Destailleur
5ea47f3ade Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/resultat/index.php
	htdocs/product/admin/product.php
	htdocs/projet/tasks/list.php
 2020-07-08 18:11:58 +02:00
Laurent Destailleur
cb5577826d Look and feel v13 2020-07-07 03:50:14 +02:00
Laurent Destailleur
14c98f277b NEW Can change VAT rate of all lines of a draft object in one step. 2020-07-06 22:48:22 +02:00
Laurent Destailleur
7d7ef1e72a FIX option PRODUIT_CUSTOMER_PRICES_BY_QTY 
Fix setup of product
 2020-07-06 15:34:26 +02:00
Laurent Destailleur
344098fe23 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/actions_fetchobject.inc.php
	htdocs/langs/fr_FR/contracts.lang
	htdocs/langs/fr_FR/loan.lang
	htdocs/langs/fr_FR/stocks.lang
 2020-07-05 13:01:00 +02:00
Laurent Destailleur
1c19c97cf2 FIX missing setup of extrafields for MO 
FIX all extrafields cleared after update of one of them
FIX Update of extrafields date
FIX Update of extrafiels on draft object
FIX Sql type
Fix trans on BOM
 2020-07-04 16:14:53 +02:00
Laurent Destailleur
ee5156034d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-24 20:03:40 +02:00
Laurent Destailleur
2865d6bd15 Fix set of free product 2020-06-24 13:39:00 +02:00
Laurent Destailleur
c54294285a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
 2020-06-20 12:28:14 +02:00
florian HENRY
7fef9a813e fix warning and clean old code about multiselect category 2020-06-18 20:03:03 +02:00
Laurent Destailleur
1736ecfa26 Fix phpcs 2020-06-15 04:32:59 +02:00
Laurent Destailleur
90b5ed9908 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/website.lib.php
 2020-06-11 23:41:35 +02:00
Laurent Destailleur
3831b56423 Missing tags 2020-06-11 17:07:41 +02:00
Laurent Destailleur
5b882e333d Fix tooltip on localtaxes 2020-06-10 23:00:17 +02:00
Laurent Destailleur
5794b1abea Fix for use with text browser 
Conflicts:
	htdocs/main.inc.php
 2020-06-10 12:46:55 +02:00
Laurent Destailleur
bd22ad4174 Fix for use with text browser 2020-06-10 12:35:39 +02:00
Laurent Destailleur
da672c8776 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/admin/translation.php
	htdocs/core/class/html.formfile.class.php
	htdocs/societe/card.php
 2020-06-06 11:57:31 +02:00
Laurent Destailleur
d252248319 Fix back to link in ECM menu 
Fix picto in search_page
 2020-06-05 13:41:33 +02:00
bahfir abbes
cb551cfd5a fix:non editable fields must not be editable in creation either 2020-06-01 20:58:20 +02:00
bahfir abbes
26f280b74b fix:non editable fields must not be editable in creation either 2020-05-31 01:33:34 +01:00
Laurent Destailleur
32aecb553b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2020-05-28 11:44:58 +02:00
Laurent Destailleur
45615081ec FIX Bad use/detetion of text/html when forging template email. 2020-05-28 11:41:48 +02:00
Laurent Destailleur
16625af34e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/tpl/filemanager.tpl.php
 2020-05-27 14:28:20 +02:00
Laurent Destailleur
3ef1ca1764 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/ecm/class/ecmfiles.class.php
	htdocs/ecm/index.php
 2020-05-27 14:24:03 +02:00
Laurent Destailleur
a207365bd2 FIX XSS using the renaming of .noexe files - reported by Nolan. 2020-05-27 13:12:18 +02:00
Frédéric FRANCE
726d7817c4
add new rule 2020-05-21 16:13:46 +02:00
Frédéric FRANCE
5940d3705a
add new rule 2020-05-21 16:00:12 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule 2020-05-21 01:41:27 +02:00
Laurent Destailleur
cce72ad8d6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/objectline_title.tpl.php
	htdocs/langs/en_US/bills.lang
	htdocs/projet/class/project.class.php
 2020-05-20 20:10:48 +02:00
Laurent Destailleur
6f52c62f2a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/bills.lang
 2020-05-20 19:53:28 +02:00
Laurent Destailleur
434341316b suggest some fix to debug situation invoices 2020-05-20 19:51:04 +02:00
Laurent Destailleur
0b3e917155 CSS 2020-05-14 14:30:26 +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
1ec8b31e46 Fix remove action param in url to allow a second try without the error 
message
 2020-05-06 15:15:12 +02:00
Maxime Kohlhaas
e0ebe85c13 Fix addline titles 2020-05-03 09:15:12 +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
91523b4b64 FIX Can switch from double to price type for extrafields 
Conflicts:
	htdocs/core/tpl/admin_extrafields_edit.tpl.php
 2020-04-28 14:27:22 +02:00
Laurent Destailleur
7a73915e92 FIX Can switch from double to price type for extrafields 2020-04-28 14:22:13 +02:00
Laurent Destailleur
635b9bb0fe FIX #13641 2020-04-27 15:27:03 +02:00
Laurent Destailleur
c0821a8ed6 Fix phpcs 2020-04-27 00:02:31 +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
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
gauthier
e98671e404 FIX : Access to undeclared static property: Contact::$table_element 2020-04-24 15:22:38 +02:00
Laurent Destailleur
496d8f354f Look and feel v12 2020-04-22 17:59:54 +02:00
Laurent Destailleur
1ef89eb1a1 Fix $mysoc global not loaded. 2020-04-21 14:14:49 +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
Laurent Destailleur
b0515c626b Look and feel v12 2020-04-18 00:09:24 +02:00
Laurent Destailleur
803b0eb3bd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-16 12:39:45 +02:00
Laurent Destailleur
dd50083a81 Look and feel v12 2020-04-16 12:39:34 +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
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
18f2087cc6 Fix look and feel v12 2020-04-08 15:13:01 +02:00
Laurent Destailleur
d257b5553e
Merge pull request #13351 from TobiasSekan/FixErrorAndSortingInContactView 
FIX error and sorting in contact view
 2020-04-08 15:03:37 +02:00
Laurent Destailleur
b1c5490a74 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/extrafields_add.tpl.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
 2020-04-05 04:03:53 +02:00
Laurent Destailleur
165df931f1 Complete fix #13491 2020-04-05 03:14:12 +02:00
Laurent Destailleur
22a8c207f4
Merge pull request #13491 from atm-lena/11.0_FIX_Ticket_ExtrafieldsVisibility_4 
FIX 11.0 Ticket - Visibility 4, don't display extrafields at the creation
 2020-04-05 02:54:41 +02:00
Scrutinizer Auto-Fixer
612bac6598 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-05 00:44:59 +00:00
Laurent Destailleur
28a1b7af35 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/index.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-04-03 18:07:24 +02:00
atm-lena
bc0d98b91c FIX 11.0 Ticket Module - Visibility 4, don't display extrafields at the creation 2020-04-03 14:24:59 +02:00
Laurent Destailleur
f7b6895dc6 Fix option to not generate doc in modulebuilder. 2020-04-03 14:02:37 +02:00
Laurent Destailleur
99ddd25ad5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-04-02 16:51:50 +02:00
Laurent Destailleur
b407797ca3 Fix css 2020-03-31 17:45:45 +02:00
florian HENRY
5658d783d6 fix advtargetemailing : fatal call to static attribut (that is not static: table_element) 2020-03-31 12:04:34 +02:00
Laurent Destailleur
ff549cad18
Merge pull request #13417 from FHenry/dev_tasklist_columnAndExtrafields 
NEW : Project task list, add column selector and extrafields
 2020-03-30 18:53:42 +02:00