Commit Graph

2013 Commits

Author SHA1 Message Date
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