Laurent Destailleur
12e847ade1
Fix color of reports. Fix include_once into include.
2021-04-06 22:18:32 +02:00
Alexandre SPANGARO
36e4f5aa22
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-04-06 10:29:44 +02:00
Laurent Destailleur
95de241245
FIx #yogosha5774
2021-04-05 15:21:17 +02:00
Alexandre SPANGARO
f64d0377c5
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-04-04 06:03:41 +02:00
Laurent Destailleur
d4f14183b7
Code comment
2021-04-01 13:15:23 +02:00
Florian Mortgat
f5617a6247
FIX 13.0 warning - missing quotes around 'label'
2021-04-01 12:33:23 +02:00
Laurent Destailleur
354adbde54
Look and feel v14
2021-04-01 12:27:02 +02:00
Laurent Destailleur
8e14b4d434
FIX #yogosha5775
2021-04-01 11:27:39 +02:00
Laurent Destailleur
6fc70fba8c
Merge pull request #16981 from FHenry/dev_EventOrganisation
...
new: working on conference or booth object and event type #FoundationFunding
2021-03-31 22:29:39 +02:00
Florian HENRY
73d7eefdcf
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-31 20:09:44 +02:00
Frédéric FRANCE
1823fb34bb
Merge remote-tracking branch 'upstream/develop' into repairToUtf8mb4
2021-03-31 18:41:49 +02:00
Laurent Destailleur
2e3af575be
Look and feel v14
2021-03-31 18:12:26 +02:00
Laurent Destailleur
14c7ce7492
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/reception/card.php
2021-03-31 13:59:21 +02:00
Laurent Destailleur
89dbd745bf
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/modules/modAccounting.class.php
2021-03-31 13:53:36 +02:00
Laurent Destailleur
1880cb92a4
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-03-31 13:47:00 +02:00
Ferran Marcet
b6faa6b605
FIX: Show Ref.Supplier in LinkToObjectBlock
2021-03-31 09:40:12 +02:00
UT from dolibit
34077d5b8a
Update canvas.class.php
2021-03-30 18:31:36 +02:00
Laurent Destailleur
3744bc6a7a
FIX #yogosha5746 - next step (work in progress)
2021-03-30 18:17:13 +02:00
Laurent Destailleur
fae3cca494
FIX #yogosha5746 - next step (work in progress)
2021-03-30 17:45:15 +02:00
Laurent Destailleur
6e422d26f3
FIX #yogosha5746 - next step (wip)
2021-03-30 16:20:18 +02:00
Laurent Destailleur
6c98276ead
FIX #yogosha5782
2021-03-30 11:26:49 +02:00
Ferran Marcet
b4f638602a
FIX: Show Ref.Supplier in LinkToObjectBlock
2021-03-30 11:10:07 +02:00
Laurent Destailleur
fb84608586
Clean sql
2021-03-30 03:37:54 +02:00
Laurent Destailleur
9edb2fd857
Fix sql error
2021-03-30 02:13:57 +02:00
Laurent Destailleur
3616d2ba44
FIX #yogosha5770
2021-03-29 23:24:52 +02:00
Laurent Destailleur
843e0a2c39
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/core/class/html.formother.class.php
htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
htdocs/projet/tasks/time.php
htdocs/webservices/server_thirdparty.php
2021-03-29 21:47:31 +02:00
Laurent Destailleur
ae0468e107
FIX #yogosha5765
2021-03-29 21:04:33 +02:00
Laurent Destailleur
a4987c6e4f
Merge branch 'develop' into 14a22
2021-03-29 20:35:35 +02:00
Florian HENRY
f25360cc4c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-29 15:49:43 +02:00
Laurent Destailleur
3a4bb69c05
FIX #yogosha5749
2021-03-29 15:32:09 +02:00
Laurent Destailleur
ce1f8289a4
FIX #yogosha5746
2021-03-29 15:07:23 +02:00
Laurent Destailleur
b929641fe1
Look and feel v14
2021-03-29 13:00:17 +02:00
Florian HENRY
5926db2704
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft1
2021-03-29 12:10:35 +02:00
Laurent Destailleur
85f6a15678
Fix position of users in combo list
2021-03-29 11:58:51 +02:00
Laurent Destailleur
a5d84200dc
Clean code for invoice list
2021-03-28 19:22:04 +02:00
Alexandre SPANGARO
2a1cc04b66
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-03-28 06:16:33 +02:00
Laurent Destailleur
1d48b883a7
Look and feel v14
2021-03-27 13:17:56 +01:00
Florian HENRY
3e12820f0e
fix comment
2021-03-26 18:37:11 +01:00
Florian HENRY
f87711bf2f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-26 18:30:08 +01:00
Laurent Destailleur
84ec032cc0
Look and feel v14
2021-03-26 17:58:00 +01:00
Laurent Destailleur
02ba8810cf
Better error message
2021-03-26 12:23:42 +01:00
Laurent Destailleur
44cb9dca67
FIX must use getUrlContent to get external url in RSS module
2021-03-25 19:05:01 +01:00
Laurent Destailleur
d9108362ba
War against $_POST
2021-03-25 16:59:47 +01:00
Laurent Destailleur
a4aa806e44
Merge pull request #16933 from daraelmin/daraelmin-patch-2
...
Fix #16794 V13 order by status instead of statut
2021-03-25 08:31:44 +01:00
Laurent Destailleur
5af02d96cd
Show entity for user only if different than current entity
2021-03-25 03:58:54 +01:00
Laurent Destailleur
930742dadf
Merge pull request #16846 from ptibogxiv/patch-418
...
NEW auto notification with templated emails
2021-03-25 01:48:44 +01:00
Laurent Destailleur
3f8d71d024
Merge pull request #16950 from code42fr/fix_translation_tag_#16941
...
Fix translation tag #16941
2021-03-25 00:26:48 +01:00
Laurent Destailleur
87bb84310d
Update translate.class.php
2021-03-25 00:26:16 +01:00
Laurent Destailleur
eeba9e4d50
Code comment
2021-03-24 21:58:06 +01:00
Laurent Destailleur
21a9779fe2
FIX inconsistency in margin recording with option "Force to sale price"
2021-03-24 21:49:45 +01:00
Laurent Destailleur
a5034d44f7
$_POST war
2021-03-24 19:53:31 +01:00
Laurent Destailleur
211c5b53eb
NEW Can set if a ticket group is visible on public interface or not.
2021-03-24 13:16:17 +01:00
hugo
8a1cd3e471
FIX #16941 langs trans escape tag <i
2021-03-24 10:08:19 +01:00
Florian HENRY
d043c8f4ba
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-23 21:05:11 +01:00
Florian HENRY
cc78e7c685
add field on conf or booth tabs
2021-03-23 21:04:38 +01:00
Laurent Destailleur
02509ccbc4
Responsive
2021-03-23 20:39:11 +01:00
Laurent Destailleur
538547acfe
Add currency into combo of bank account (for a future use in js)
2021-03-23 16:26:31 +01:00
Laurent Destailleur
00e48aa922
Clean and secured code for ajax/row.php
2021-03-23 16:09:02 +01:00
Laurent Destailleur
b275789223
Fix regression
2021-03-23 12:22:30 +01:00
Laurent Destailleur
f7ba0ee381
Fix set of parent company with ajax
2021-03-22 22:50:43 +01:00
Laurent Destailleur
ca1715df96
Add some protection for SQL injection
2021-03-22 13:31:06 +01:00
Laurent Destailleur
6063b02bf4
Fix #ygosha5698
2021-03-22 12:47:23 +01:00
Laurent Destailleur
6a0e0f4c06
Fix #ygosha5698
2021-03-22 12:10:51 +01:00
Laurent Destailleur
15440917b1
Fix #ygosha5698
2021-03-22 11:30:18 +01:00
daraelmin
6ba878725e
Fix #16794 V13 order by status instead of statut
2021-03-22 07:28:16 +01:00
ptibogxiv
6d26b4aec3
Update notify.class.php
2021-03-21 21:11:39 +01:00
Laurent Destailleur
800eeef868
Clean code
2021-03-21 18:20:37 +01:00
Laurent Destailleur
af199189b3
NEW Add color and picto for direction of movement
2021-03-21 13:46:01 +01:00
Laurent Destailleur
eeb1c5d884
Replace deprecated code
2021-03-20 21:46:10 +01:00
Laurent Destailleur
9900429fd0
Merge pull request #16889 from frederic34/adherent_to_member
...
rename files from adherent to member
2021-03-20 20:37:44 +01:00
Laurent Destailleur
8f6f8248a3
Merge pull request #16885 from daraelmin/daraelmin-patch-4
...
#Fix #16767 unremovable attached file in mailmodel
2021-03-20 19:51:26 +01:00
Frédéric FRANCE
d2f7d3064d
can use $conf->member
2021-03-20 19:09:49 +01:00
daraelmin
cb71936ccd
#Fix #16767 unremovable attached file in mailmodel
...
#Fix #16767 make default attached file of a mail model selected removable
2021-03-20 14:10:56 +01:00
daraelmin
2d7f858c1a
#Fix #16767 unremovable attached file in mailmodel
...
#Fix #16767 unremovable attached file in mailmodel
2021-03-20 14:04:20 +01:00
Laurent Destailleur
e334e83a64
Merge branch 'develop' into 14a22
2021-03-20 13:42:54 +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
Laurent Destailleur
3cc8a8e2ee
Merge pull request #16850 from frederic34/patch-4
...
fix php8 warning
2021-03-20 11:28:47 +01:00
Laurent Destailleur
685ec0bc63
Merge pull request #16872 from frederic34/patch-22
...
fix doxygen
2021-03-20 11:15:32 +01:00
Frédéric FRANCE
8142d76394
fix php8 warnings
2021-03-20 10:50:02 +01:00
Frédéric FRANCE
49ff44e414
fix doxygen
2021-03-20 10:21:23 +01:00
Frédéric FRANCE
93ae7a3fed
fix php8 warning
2021-03-19 17:01:14 +01:00
Laurent Destailleur
aef2f1713e
FIX #yogosha5673
2021-03-19 13:25:58 +01:00
stickler-ci
08727a86b0
Fixing style errors.
2021-03-19 10:53:06 +00:00
ptibogxiv
d38f7f7dfe
NEW auto notification with templated emails
2021-03-19 11:50:15 +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
5037de49c4
Merge pull request #16773 from frederic34/patch-5
...
fix php8 warning
2021-03-18 23:19:32 +01:00
Laurent Destailleur
b66173a111
Merge pull request #16771 from frederic34/projet_task_stats
...
fix php8 warnings
2021-03-18 23:15:37 +01:00
Laurent Destailleur
1ecb2ed342
Merge pull request #16780 from frederic34/patch-11
...
fix php8 warning
2021-03-18 23:09:54 +01:00
Frédéric FRANCE
b584adf299
fix project replace projet
2021-03-18 21:10:55 +01:00
Frédéric FRANCE
c43d3dff92
fix project replace projet
2021-03-18 20:51:40 +01:00
Laurent Destailleur
ac6b6f22e7
Enhance sanitizing of data
2021-03-18 11:39:23 +01:00
Frédéric FRANCE
22ac6c79b3
fix php8 warning
2021-03-17 22:29:33 +01:00
Laurent Destailleur
31478d5ac0
Look and feel v14
2021-03-17 22:01:25 +01:00
Frédéric FRANCE
fced63e93b
fix php8 warning
2021-03-17 20:11:22 +01:00
Laurent Destailleur
24576897ef
Merge pull request #16750 from frederic34/restrictiononfksoc
...
fix php8 warnings
2021-03-17 17:05:23 +01:00
Laurent Destailleur
36cb213a83
Merge pull request #16764 from hregis/fix_php_8_warning_again
...
FIX avoid php 8.x warning
2021-03-17 16:50:21 +01:00
Regis Houssin
4d149dc3fe
FIX avoid php 8.x warning
2021-03-17 15:15:51 +01:00
Regis Houssin
bb4c8d9114
FIX avoid warning with php 8
2021-03-17 12:48:59 +01:00
Laurent Destailleur
8de1b4c94e
Factorize code
2021-03-17 11:34:19 +01:00
Frédéric FRANCE
4e8ea5c07e
fix php8 warnings
2021-03-16 21:13:15 +01:00
Laurent Destailleur
017120f017
Merge pull request #16697 from frederic34/patch-3
...
fix syntax
2021-03-16 10:42:49 +01:00
Laurent Destailleur
87ab711a0f
Merge pull request #16707 from FHenry/dev_EventOrganisation
...
new: working on conference or booth object and event type #FoundationFunding
2021-03-16 10:34:55 +01:00
Laurent Destailleur
897f4be033
Merge pull request #16712 from frederic34/patch-9
...
fix php8 warnings
2021-03-16 10:33:01 +01:00
Laurent Destailleur
401aeb8a7f
Merge pull request #16706 from frederic34/htmlforcc
...
decompose code
2021-03-16 10:32:44 +01:00
Laurent Destailleur
462164a5a8
Merge pull request #16709 from frederic34/patch-5
...
fix php8 warnings
2021-03-16 10:31:53 +01:00
Alexandre SPANGARO
6e17a588bb
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-03-16 03:26:28 +01:00
Frédéric FRANCE
2d741a33f0
fix php8 warning
2021-03-15 21:03:54 +01:00
Frédéric FRANCE
f7d43ce4fb
fix php8 warnings
2021-03-15 20:55:59 +01:00
Frédéric FRANCE
a0e6f454ff
fix php8 warnings
2021-03-15 20:31:55 +01:00
Florian HENRY
177a6bfe4f
conference or booth card and list ok
2021-03-15 20:20:53 +01:00
Frédéric FRANCE
e89cfc3753
decompose code
2021-03-15 20:17:01 +01:00
Frédéric FRANCE
910b4f1daf
Update html.formmail.class.php
2021-03-15 18:58:35 +01:00
Frédéric FRANCE
dd4b8f2880
Update html.formmail.class.php
2021-03-15 18:22:50 +01:00
Laurent Destailleur
a8c34a5b05
Invert MAIN_EXTRAFIELDS_USE_SELECT2 into
...
MAIN_EXTRAFIELDS_DISABLE_SELECT2
2021-03-15 14:16:55 +01:00
Laurent Destailleur
7d1e18f5ab
Merge pull request #16625 from FHenry/dev_EventOrganisation
...
new: working on conference or booth object and event type #FoundationFunding
2021-03-15 11:37:57 +01:00
Frédéric FRANCE
bbb0d9acc4
fix php8 warning
2021-03-14 20:31:13 +01:00
Laurent Destailleur
cc10106a21
Fix protection on int
2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7
Fix yogosha #5627
2021-03-14 11:48:39 +01:00
Laurent Destailleur
af5db0f5fa
Look and feel v14
2021-03-12 15:34:31 +01:00
Florian HENRY
f17aa47ad6
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft
2021-03-11 22:03:51 +01:00
Laurent Destailleur
fc08c48bf3
Merge pull request #16591 from Givriz/dev
...
Replace gender and civility by a picto
2021-03-11 21:36:16 +01:00
Florian HENRY
862926316a
working on list
2021-03-11 19:09:42 +01:00
Damien BENOIT
420a3a73dd
Update html.form.class.php
2021-03-11 18:15:22 +01:00
lmarcouiller
9aa20585be
Fix #16617 : fix event add when removing boxes
2021-03-11 10:10:20 +01:00
Damien BENOIT
2b33bb2d04
Merge pull request #11 from Dolibarr/develop
...
Update fork
2021-03-10 16:53:35 +01:00
Damien BENOIT
93675082d7
Update html.form.class.php
2021-03-10 16:42:14 +01:00
Laurent Destailleur
c2200e6ffd
Clean code
2021-03-10 16:41:48 +01:00
Givriz
6e46396b17
Ajout de picto pour le genre et la civilité
2021-03-10 16:31:50 +01:00
Laurent Destailleur
9ed128c6fa
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/class/html.formaccounting.class.php
htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
htdocs/langs/en_US/errors.lang
htdocs/product/card.php
2021-03-10 15:35:09 +01:00
Laurent Destailleur
680f6257a0
FIX warning if setup of chart of account is not yet done.
2021-03-10 11:04:28 +01:00
Laurent Destailleur
b1f4c29fde
Fix missing alias
2021-03-09 20:12:14 +01:00
Laurent Destailleur
b778820fe2
Merge pull request #16596 from FHenry/dev_allowAliasInCommonObject_GetFiledList
...
Dev allow alias in common object get filed list
2021-03-09 16:54:22 +01:00
Laurent Destailleur
3cb072f67a
Update commonobject.class.php
2021-03-09 15:13:20 +01:00
Laurent Destailleur
1b3aae1984
Fix regression
2021-03-09 12:17:32 +01:00
Laurent Destailleur
53f8ff060a
Fix phpcs
2021-03-09 10:40:22 +01:00
Florian HENRY
ce5324c08c
Merge HEAD, branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_allowAliasInCommonObject_GetFiledList
2021-03-09 10:24:07 +01:00
Florian HENRY
bcbf8bb72a
allow table alias into commonObject getFieldList
2021-03-09 10:21:32 +01:00
Laurent Destailleur
c3a047ee06
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/class/api_agendaevents.class.php
2021-03-08 19:31:47 +01:00
Laurent Destailleur
2f0c4038fb
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/comm/action/class/api_agendaevents.class.php
htdocs/compta/sociales/card.php
htdocs/societe/consumption.php
2021-03-08 19:27:34 +01:00
Laurent Destailleur
3b80b9dd75
Fix regression
2021-03-08 16:37:52 +01:00
Laurent Destailleur
a79a4e876d
Merge branch 'develop' into boxindex
2021-03-08 16:34:05 +01:00
Laurent Destailleur
24a0700426
Merge pull request #16573 from frederic34/box_index_societe
...
can add box on thirparties index
2021-03-08 16:25:46 +01:00
Laurent Destailleur
1aba0c2bc9
NEW Can set order of execution of hooks
2021-03-08 15:56:41 +01:00
Laurent Destailleur
ab89d85095
Fix for php8
2021-03-08 11:33:07 +01:00
ksar
ec8baa6bff
Update commondocgenerator.class.php
...
#16341
2021-03-08 10:00:19 +01:00
Frédéric FRANCE
92754760f4
can add box on thirparties index
2021-03-06 16:38:07 +01:00
Laurent Destailleur
0a0bb92689
Fix phpcs
2021-03-06 11:37:23 +01:00
Laurent Destailleur
e5d8267786
Merge pull request #16546 from FHenry/12.0
...
fix: set class attribute at right place
2021-03-06 11:18:02 +01:00
Laurent Destailleur
cbd6357f45
Merge pull request #16556 from marc-dll/NEW_ldap_group_filter
...
NEW: LDAP: usergroup search can be filtered
2021-03-06 11:08:24 +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
6aa929cbf8
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-03-05 18:28:15 +01:00
stickler-ci
06cabb35ec
Fixing style errors.
2021-03-05 10:24:28 +00:00
Marc de Lima Lucio
396fb3fae3
FIX: ldap: bad function comment
2021-03-05 11:21:04 +01:00
Marc de Lima Lucio
f731545af4
NEW: ldap: filter search on usergroups
2021-03-05 11:14:21 +01:00
Florian HENRY
6de6782458
fix: set class at right place
2021-03-05 08:41:04 +01:00
Laurent Destailleur
7d20df8054
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries
...
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
2021-03-04 16:53:54 +01:00
atm-greg
c41b59b14c
Fix : when we have got models in database attached files are cleared even if we did not have selected a model
2021-03-04 14:23:08 +01:00
Juanjo Menent
a04a4806e0
Fix: lost selecteds items in ticket creation
2021-03-04 11:50:46 +01:00
Laurent Destailleur
7bc2e1ffad
FIX Timezone management for datetime with modulebuilder and extrafields
2021-03-04 10:31:31 +01:00
Laurent Destailleur
33c4180781
FIX Timezone management for datetime with modulebuilder
2021-03-04 09:36:19 +01:00
Laurent Destailleur
43e58f70a1
Merge pull request #16528 from frederic34/patch-4
...
remove unused code
2021-03-03 15:10:58 +01:00
Frédéric FRANCE
d05c0b749a
remove unused code
2021-03-03 13:11:10 +01:00
Frédéric FRANCE
2d9f00eb57
Update commonobject.class.php
2021-03-03 12:24:44 +01:00
Frédéric FRANCE
a8bf47b9ce
fix unknown constant and variable
2021-03-03 12:02:48 +01:00
Frédéric FRANCE
6cf8a46095
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-03-02 20:41:01 +01:00
lvessiller
66ad8fbb24
FIX select list dependancies on common object ( FIX #16510 )
2021-03-02 17:21:55 +01:00
Laurent Destailleur
c81d5ff4d0
Introduce a variable to cache some data.
2021-03-02 16:13:00 +01:00
Laurent Destailleur
7f1d61f8a8
Fix phpcs
2021-03-02 15:34:43 +01:00
Laurent Destailleur
42329b10c9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
build/generate_filelist_xml.php
htdocs/comm/propal/card.php
htdocs/commande/card.php
htdocs/compta/facture/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/modulebuilder.lib.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
htdocs/ticket/list.php
2021-03-02 15:27:20 +01:00
Florian HENRY
2c163b8163
fix #16510
2021-03-02 15:22:22 +01:00
Laurent Destailleur
1f25f2bb7e
Fix phpcs
2021-03-02 15:09:29 +01:00
Laurent Destailleur
cdfb9254b3
Merge pull request #16510 from FHenry/13.0_fix_missing_list_dependencies_for_modulebuilder_fields
...
FIX : select list dependencies now work for ModuleBuilder sellist field
2021-03-02 14:51:53 +01:00
Laurent Destailleur
3982a36a3e
Update commonobject.class.php
2021-03-02 14:47:35 +01:00
Laurent Destailleur
7144e80063
Merge pull request #16322 from FHenry/dev_new_conf_defaulteventstatus
...
NEW: Conf for default actiomm status when created from card (and DefaultValues CRUD class)
2021-03-02 14:45:05 +01:00
Florian HENRY
27c354567a
FIX : select list dependencies now work for ModuleBuilder sellist field
2021-03-02 14:06:11 +01:00
Laurent Destailleur
acb7b30eb0
Merge pull request #16507 from frederic34/add_rule
...
Add rule
2021-03-02 12:52:03 +01:00
Laurent Destailleur
1132ed306c
Merge pull request #16506 from andreubisquerra/patch-1
...
Avoid php errors if negative var in Receipt Module
2021-03-02 12:50:57 +01:00
Laurent Destailleur
a161edefb1
Look and feel v14
2021-03-02 12:33:55 +01:00
Florian HENRY
812d3279b3
Merge branch 'dev_new_conf_defaulteventstatus' of github.com:FHenry/dolibarr into dev_new_conf_defaulteventstatus
2021-03-02 11:06:52 +01:00
Florian HENRY
0f7144a391
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus
2021-03-02 11:05:20 +01:00
Frédéric FRANCE
cb507a61b9
backup with utf8mb4
2021-03-02 09:54:52 +01:00
Laurent Destailleur
7f209f7cc7
Clean code
2021-03-02 02:55:24 +01:00
Laurent Destailleur
cffea1889f
FIX #16325
2021-03-02 01:17:28 +01:00
Laurent Destailleur
f1f950e8b7
Close #16395 - Can filter on proposal source in list
2021-03-02 00:11:15 +01:00
Frédéric FRANCE
3b428004d8
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-03-02 00:09:44 +01:00
andreubisquerra
5bb7c521aa
Update dolreceiptprinter.class.php
2021-03-01 23:30:38 +01:00
andreubisquerra
15cc0f8775
Avoid php errors if negative var in Receipt Module
...
Solved in develop branch with PR https://github.com/Dolibarr/dolibarr/pull/15994/files
After testing we introduce it in version 13
2021-03-01 23:09:07 +01:00
Frédéric FRANCE
f2cdbf6bb2
Merge remote-tracking branch 'upstream/develop' into add_rule
2021-03-01 21:22:34 +01:00
stickler-ci
54d35fa59f
Fixing style errors.
2021-03-01 20:00:32 +00:00
Florian HENRY
32ef55cd9e
working default status/percent for event actioncomm
2021-03-01 20:58:02 +01:00
Frédéric FRANCE
a4e25359e7
add missing rule
2021-03-01 20:37:16 +01:00
Florian HENRY
f62386a6a5
set Default values as CURD classes
2021-03-01 20:36:42 +01:00
Florian HENRY
1b57d2a4a0
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus
2021-03-01 19:57:54 +01:00
Florian HENRY
7d3bd131ab
default envent status
2021-03-01 19:54:30 +01:00
Florian HENRY
0edae6e19a
add class default values
2021-03-01 18:25:23 +01:00
Laurent Destailleur
1cdea45707
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/adherents/subscription/list.php
htdocs/societe/canvas/company/tpl/card_create.tpl.php
htdocs/societe/canvas/individual/tpl/card_create.tpl.php
htdocs/societe/card.php
2021-03-01 17:46:36 +01:00
Laurent Destailleur
222012da37
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/paymentvarious.class.php
htdocs/compta/bank/various_payment/card.php
htdocs/don/card.php
htdocs/langs/en_US/main.lang
htdocs/public/payment/newpayment.php
test/phpunit/DateLibTzFranceTest.php
2021-03-01 15:48:30 +01:00
Frédéric FRANCE
8c45137b37
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-03-01 12:55:45 +01:00
Gauthier PC portable 024
6da28f5e44
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-03-01 11:12:03 +01:00
Alexandre SPANGARO
94a861c1c8
Code enhanced - Standardize field name
2021-03-01 04:07:31 +01:00
Alexandre SPANGARO
0d954cb1c7
FIX: Total_ht not show in contract link element
2021-03-01 03:09:36 +01:00
Frédéric FRANCE
1b046f25cf
add new rule
2021-03-01 00:19:52 +01:00
Alexandre SPANGARO
de241eced3
FIX: Total_ht not show in contract link element
2021-02-28 22:22:20 +01:00
Alexandre SPANGARO
7a3dfda8ee
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-02-28 21:30:25 +01:00
Laurent Destailleur
6294ae61a8
Look and feel v14
2021-02-28 14:26:32 +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
2a3b3753a8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-02-28 13:27:38 +01:00
Laurent Destailleur
3a19cbb062
FIX #16420 #16423 #16488 #16477
2021-02-28 12:47:24 +01:00
Alexandre SPANGARO
ca7958f273
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-02-28 07:32:23 +01:00
Laurent Destailleur
753b1d1e11
FIX status on tooltip on widgets
2021-02-27 19:43:56 +01:00
Laurent Destailleur
5c0ea476e1
Look and feel v14
2021-02-27 12:45:07 +01:00
Frédéric FRANCE
8bfa7565bd
Update commonobject.class.php
2021-02-27 08:52:40 +01:00
Frédéric FRANCE
2cc635fd09
FIX https://github.com/Dolibarr/dolibarr/issues/16465
2021-02-27 08:00:02 +01:00
Laurent Destailleur
34d00e5d5e
Look and feel v14
2021-02-27 02:44:52 +01:00
Gauthier PC portable 024
e598b49545
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-26 15:33:36 +01:00
Laurent Destailleur
f5406d487b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/product.lib.php
htdocs/product/stock/productlot_card.php
test/phpunit/SecurityTest.php
2021-02-26 12:53:06 +01:00
Laurent Destailleur
16906abc09
FIX File attachment on lots
2021-02-26 12:47:57 +01:00
Gauthier PC portable 024
c996871f98
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-26 11:50:18 +01:00
Laurent Destailleur
2670d4fc17
Look and feel v14
2021-02-26 11:00:58 +01:00
Laurent Destailleur
cec9c65ab8
Merge pull request #16449 from daraelmin/daraelmin-patch-3
...
Fix #16420 undefined $model_mail_selected_id
2021-02-26 10:33:56 +01:00
Laurent Destailleur
e7ae2e65d7
Update html.formmail.class.php
2021-02-26 10:33:49 +01:00
Laurent Destailleur
e0785ac5ef
Update html.formmail.class.php
2021-02-26 10:31:02 +01:00
Laurent Destailleur
69c974800c
Update html.formmail.class.php
2021-02-26 10:30:30 +01:00
daraelmin
e079ceb9c3
Fix #16420 undefined $model_mail_selected_id
...
Set $model_mail_selected_id to 0 when it is undefined
2021-02-26 08:51:01 +01:00
daraelmin
5d31a93bf0
Fix #16420 - undefined $model_mail_selected_id
...
Set $model_mail_selected_id to 0 when it is undefined
2021-02-26 08:20:51 +01:00
Frédéric FRANCE
554e449e40
code syntax core directory
2021-02-23 22:03:23 +01:00
Gauthier PC portable 024
c0160a5f3b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-23 15:20:15 +01:00
Laurent Destailleur
f6080d45fa
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-22 16:21:26 +01:00
Laurent Destailleur
b674ebad88
Responsive
2021-02-22 16:21:05 +01:00
Laurent Destailleur
912f9f9bdb
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/contact/card.php
htdocs/core/actions_massactions.inc.php
2021-02-22 15:54:24 +01:00
Laurent Destailleur
c010cab47e
Fix translation of default value for contacts
2021-02-22 15:51:00 +01:00
Alexandre SPANGARO
7f4040e464
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-02-22 11:59:13 +01:00
Alexandre SPANGARO
22c936ba19
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-02-22 11:28:36 +01:00
Laurent Destailleur
f99232e66e
Merge branch 'develop' into 14a21
2021-02-22 11:18:07 +01:00
Gauthier PC portable 024
939d406ab1
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-22 09:10:24 +01:00
Alexandre SPANGARO
ae4fc565e1
Widget & commonobject
2021-02-22 05:38:31 +01:00
Alexandre SPANGARO
71ce871da6
Fix element
2021-02-22 05:13:14 +01:00
Alexandre SPANGARO
818a826c3e
Code enhanced - Standardize field name
2021-02-21 22:10:00 +01:00
Alexandre SPANGARO
2cd181b86d
Code enhanced - Standardize field name #14697
2021-02-21 22:07:58 +01:00
Laurent Destailleur
e3419df36e
Merge branch 'develop' into 14a20
2021-02-21 20:28:06 +01:00
Laurent Destailleur
1e62a1a13f
Merge pull request #16359 from aspangaro/14a19
...
Code enhanced - Standardize field name #14697
2021-02-21 19:18:33 +01:00
Laurent Destailleur
cfccc49235
Code comment
2021-02-20 17:23:03 +01:00
Laurent Destailleur
4b632fb24f
Merge branch 'develop' into 14a19
2021-02-20 17:08:23 +01:00
Laurent Destailleur
7c25f06f58
Merge pull request #16353 from aspangaro/14a18
...
Code enhanced - Standardize field name #14697
2021-02-20 16:51:34 +01:00
Alexandre SPANGARO
3dcfe40e71
Code enhanced - Standardize field name #14697
2021-02-20 08:00:27 +01:00
Alexandre SPANGARO
1017d480f9
Code enhanced - Standardize field name #14697
2021-02-20 07:08:37 +01:00
Laurent Destailleur
581d137aa8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-19 22:06:56 +01:00
Laurent Destailleur
712c2f20df
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2021-02-19 22:06:48 +01:00
Laurent Destailleur
b167a4a0c7
FIX date selector when using reduced year (like on smartphone)
2021-02-19 22:00:44 +01:00
Alexandre SPANGARO
708a9fb453
Code enhanced - Standardize field name
2021-02-19 21:57:54 +01:00
Laurent Destailleur
eeedbccc71
Merge pull request #16351 from aspangaro/14a16
...
NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD
2021-02-19 18:20:17 +01:00
Laurent Destailleur
069cf46f16
Merge pull request #16347 from andreubisquerra/master
...
NEW Can use captcha on public page to create ticket
2021-02-19 18:07:25 +01:00
Laurent Destailleur
26134930b3
Update html.formticket.class.php
2021-02-19 18:05:12 +01:00
daraelmin
52dce616b9
FIX 16165 Create customer discount without vat
2021-02-19 18:03:36 +01:00
Laurent Destailleur
5f0fd91463
Merge pull request #16340 from daraelmin/daraelmin-patch-1
...
FIX #16165 Create customer discount without vat
2021-02-19 18:03:09 +01:00
Laurent Destailleur
e9f9c46cd6
Clean code. Fix nojs=1
2021-02-19 15:37:42 +01:00
Laurent Destailleur
b6211a7990
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-19 14:12:00 +01:00
Laurent Destailleur
95b859dfd5
Merge pull request #16247 from bafbes/abb120355
...
New : Hook selectForFormsListWhere
2021-02-19 12:49:42 +01:00
Alexandre SPANGARO
f462455e89
NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD
2021-02-18 21:39:25 +01:00
andreubisquerra
b8fabd90f8
NEW Use captcha on public page to create ticket
2021-02-18 19:02:16 +01:00
Laurent Destailleur
b607ed6259
Look and feel v14
2021-02-18 15:58:38 +01:00
Laurent Destailleur
2904cc803f
Fix selection in combo
2021-02-18 13:56:13 +01:00
Laurent Destailleur
56d2ac274a
NEW Support color of type of event
2021-02-18 12:46:42 +01:00
Frédéric FRANCE
cc6a7d4834
fix unknown variable
2021-02-18 09:05:44 +01:00
daraelmin
f5b162a992
FIX 16165 Create customer discount without vat
2021-02-18 08:10:14 +01:00
Gauthier PC portable 024
134d7e00ec
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-17 16:56:50 +01:00
Laurent Destailleur
9161c34f51
Fix logs
2021-02-17 15:21:52 +01:00
Laurent Destailleur
68637c3104
Better log for hook
2021-02-17 15:17:24 +01:00
Laurent Destailleur
c8824ccea0
Look and feel v14
2021-02-16 17:05:38 +01:00
Laurent Destailleur
6f25f7c2cb
Clean code
2021-02-16 11:43:26 +01:00
Laurent Destailleur
dabf9d796a
FIX Rename title of template invoice
2021-02-15 22:16:01 +01:00
Laurent Destailleur
44b3221aaf
FIX Rename title of template invoice
2021-02-15 22:15:14 +01:00
Laurent Destailleur
4ffdfe110a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-15 22:07:11 +01:00
Laurent Destailleur
7bbb603859
Fix default template for contract can be empty
2021-02-15 21:46:07 +01:00
Laurent Destailleur
be3703a05b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2021-02-15 16:46:55 +01:00
Laurent Destailleur
d183a7eedf
Merge pull request #16288 from FHenry/dev_EventOrganisation_setuppage
...
wip : Event Organization module - PR-1 - setup page #FoundationFunding
2021-02-15 15:59:19 +01:00
Laurent Destailleur
3ec515e106
Fix default value
2021-02-15 15:53:46 +01:00
Laurent Destailleur
9c1d76aaaa
Merge pull request #16294 from frederic34/patch-3
...
define variable for all execution paths
2021-02-15 15:53:12 +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
1b69456216
Complete response
2021-02-15 13:00:21 +01:00
Florian HENRY
e1f503a8cf
Merge branch 'develop' into dev_EventOrganisation
2021-02-15 11:19:08 +01:00
Frédéric FRANCE
382123b64a
define variable for all execution paths
...
The variable $filelog does not seem to be defined for all execution paths leading up to this point.
2021-02-15 08:36:40 +01:00
Laurent Destailleur
25230fb4bb
Merge pull request #16284 from andreubisquerra/develop
...
Improve logo printing compatibility with TakePOS connector
2021-02-14 21:41:45 +01:00
Laurent Destailleur
2cc4632a39
Fix js error
2021-02-14 21:32:19 +01:00
Laurent Destailleur
66c7770146
Factorize some common code for type of event
2021-02-14 20:12:43 +01:00
Florian HENRY
b5055a5edb
config pages ok
2021-02-14 16:41:57 +01:00
Florian HENRY
07984d9a6e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-02-14 15:02:29 +01:00
Florian HENRY
d7dfb9138a
working on setup
2021-02-14 15:00:20 +01:00
andreubisquerra
abda9eeb93
Improve compatibility with logo printing with TakePOS connector
2021-02-14 00:02:03 +01:00
Laurent Destailleur
cd4d790d2b
Add parameters of batch into comment description
2021-02-12 17:15:23 +01:00
Laurent Destailleur
e37a4be1d6
Update html.form.class.php
2021-02-11 20:10:15 +01:00
Anthony Berton
d10e46adca
Update commonobject.class.php
2021-02-11 17:46:28 +01:00
Anthony Berton
55f8d64202
Update commonobject.class.php
2021-02-11 12:16:07 +01:00
Laurent Destailleur
a01301c500
Fix regression in color of bar for type = line
2021-02-10 18:44:09 +01:00
Laurent Destailleur
623d7b9819
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-10 18:04:23 +01:00
Laurent Destailleur
88550ab417
Look and feel v14
2021-02-10 18:03:45 +01:00
Laurent Destailleur
72bfa81082
Update html.form.class.php
2021-02-10 14:14:28 +01:00
Laurent Destailleur
4f2e7c51fc
Fix #16129 autodetect language on public pages
2021-02-10 03:20:50 +01:00
Laurent Destailleur
89154265c6
FIX #16129
2021-02-10 03:12:19 +01:00
Laurent Destailleur
c875ad9a1c
FIX #16240
2021-02-10 02:17:01 +01:00
Laurent Destailleur
499ebd73b1
Merge pull request #16192 from FHenry/dev_add_hook_ecm_auto
...
NEW : add hook addSectionECMAuto method to add cuistom diretory into ECM auto files
2021-02-10 01:32:29 +01:00
Laurent Destailleur
afeeb40e2e
Fix show property "enabled" of extrafields
2021-02-10 00:18:00 +01:00
abb
17f77b8edb
New : Hook selectForFormsListWhere
2021-02-09 23:49:46 +01:00
Frédéric FRANCE
da8c80071f
Update html.form.class.php
2021-02-09 18:09:35 +01:00
Laurent Destailleur
21558dd0a6
Debug and enhance the feature to assign tasks on project assignation
2021-02-09 17:52:33 +01:00
Laurent Destailleur
3d892bd60b
Merge pull request #15735 from FHenry/dev_new_project_task_add_contact
...
NEW: When add contact/user to Project, ask to also affect on Tasks
2021-02-09 13:43:08 +01:00
Gauthier PC portable 024
d106fe7e90
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-09 09:50:46 +01:00
Frédéric FRANCE
266b217675
add var def in commondocgenerator
2021-02-09 08:35:22 +01:00
Frédéric FRANCE
898bf55202
Merge remote-tracking branch 'upstream/develop' into facturerec
2021-02-08 20:21:46 +01:00
Florian HENRY
b3872ca28a
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_hook_ecm_auto
2021-02-08 20:06:08 +01:00
Frédéric FRANCE
815f3602e3
clean deprecated modelpdf to model_pdf
2021-02-08 18:30:09 +01:00
Laurent Destailleur
925d81d1b3
Merge pull request #16002 from Hystepik/develop#1
...
New update of funnel of prospection
2021-02-08 18:05:48 +01:00
Laurent Destailleur
c0aa7e7db5
Merge pull request #16020 from atm-gauthier/NEW/add_real_payments_on_vat_objects
...
NEW VAT payment request and VAT payment are 2 different steps in workflow on VAT payment recording
2021-02-08 17:19:40 +01:00
Laurent Destailleur
8041ef641a
Merge branch 'develop' into dev_typent_jax_workcorrectly
2021-02-08 15:29:36 +01:00
Florian HENRY
1e8117dc8a
fix js
2021-02-08 11:49:30 +01:00
Florian HENRY
31ca17c619
fix require once
2021-02-08 11:06:21 +01:00
Gauthier PC portable 024
41af1a59f4
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-08 10:37:01 +01:00
Gauthier PC portable 024
e2a73e6c88
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects
2021-02-08 09:46:48 +01:00
Laurent Destailleur
c24a8a22d5
Merge pull request #16203 from frederic34/patch-3
...
fix phpcs
2021-02-07 19:56:07 +01:00
Laurent Destailleur
45789ec21c
Fix TZ problems
...
Conflicts:
htdocs/core/lib/company.lib.php
2021-02-07 19:47:33 +01:00
Laurent Destailleur
8c71c8335e
Fix TZ problems
2021-02-07 19:44:22 +01:00
Frédéric FRANCE
b3dc87f3b7
fix phpcs
2021-02-07 18:31:31 +01:00
Laurent Destailleur
d4df62f1da
Look and feel v14
2021-02-07 17:25:41 +01:00
Florian HENRY
377427da1d
add hook to custom directory into automatic file ECM
2021-02-06 13:25:35 +01:00
Florian HENRY
3b4f8c32f7
add hook to custom directory into automatic file ECM
2021-02-06 13:21:16 +01:00
Florian HENRY
901b3287a9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_hook_ecm_auto
2021-02-06 12:41:59 +01:00
Laurent Destailleur
c1eba5a885
Merge pull request #16188 from frederic34/menuprefix
...
modules can add prefix for menu
2021-02-06 11:41:46 +01:00
Frédéric FRANCE
df67de08b1
modules can add prefix for menu
2021-02-06 10:16:07 +01:00
Laurent Destailleur
b2aab07842
Merge pull request #16180 from grandoc/new_branch_05_02_2021
...
update minimum version
2021-02-06 00:19:17 +01:00
Laurent Destailleur
f0e1c02caa
Look and feel v14 - Use placeholder on combolists
2021-02-06 00:05:24 +01:00
Philippe GRAND
b2e61aa499
fix typo
2021-02-05 18:23:17 +01:00
Laurent Destailleur
653fa38b06
Fix autoselect of category with 'auto'
2021-02-05 15:12:12 +01:00
Laurent Destailleur
7278a8c17f
Fix autoselect of category with 'auto'
2021-02-05 15:07:07 +01:00
Laurent Destailleur
2851bac0af
Fix param urlencode
2021-02-05 14:46:20 +01:00
Florian HENRY
df7f18d4d2
add hook to add directory into ECM auto files
2021-02-05 13:33:48 +01:00
Gauthier PC portable 024
df8ca1ef84
Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries
2021-02-05 09:29:20 +01:00
Laurent Destailleur
964fa7a72d
Look and feel v14
2021-02-04 20:29:57 +01:00
Laurent Destailleur
726ef265f2
Look and feel v14
2021-02-04 19:21:07 +01:00
Gauthier PC portable 024
e188ec6cd7
NEW : add real payments on salaries objects
2021-02-04 17:21:08 +01:00
Florian HENRY
2d77787bba
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_typent_jax_workcorrectly
2021-02-04 09:06:36 +01:00
Florian HENRY
86e9398b79
no inner join
2021-02-04 09:05:58 +01:00
Laurent Destailleur
31e1e3e4df
Fix cookie for remind the collapse status
2021-02-03 22:37:20 +01:00
Laurent Destailleur
f301635681
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
2021-02-03 21:02:32 +01:00
Laurent Destailleur
787e03a10d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/class/html.formmail.class.php
2021-02-03 20:46:22 +01:00
Laurent Destailleur
4bba124c3f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-02-03 20:43:32 +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
bd9eb4c949
FIX Assignement of actors on tasks
2021-02-02 15:36:54 +01:00
Laurent Destailleur
fed99aa3bb
FIX Assignement of actors on tasks
2021-02-02 15:35:40 +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
85357a34c8
Fix style of injected combo to select variant
2021-02-02 13:12:12 +01:00
Laurent Destailleur
b80de4aeaf
FIX CSRF errors on margin forms
2021-02-02 13:04:41 +01:00
lvessiller
3b050c3452
FIX select default mail template
2021-02-02 10:34:33 +01:00
Laurent Destailleur
2e9656a5b2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formactions.class.php
htdocs/filefunc.inc.php
2021-02-02 03:26:20 +01:00
Laurent Destailleur
daf88944f8
FIX #16118 Timezone problem on some fields
2021-02-02 00:19:41 +01:00
Laurent Destailleur
e6deed1601
Fix collapse
2021-02-01 15:40:59 +01:00
Gauthier PC portable 024
1eb4968a29
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects
2021-02-01 12:00:04 +01:00
Laurent Destailleur
641885d814
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-31 19:05:27 +01:00
Laurent Destailleur
3801dd34cd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2021-01-31 19:02:57 +01:00
Laurent Destailleur
d023afb66f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-01-31 18:55:11 +01:00
Laurent Destailleur
18d222f32f
Fix code comment
2021-01-31 18:06:02 +01:00
Laurent Destailleur
e5b4c76a26
Fix combo to select action status
2021-01-28 19:38:47 +01:00
Laurent Destailleur
db9b6b53da
NEW Can set a label as placeholder for combo lists.
2021-01-28 16:31:32 +01:00
Gauthier PC portable 024
8a5588e518
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects
2021-01-28 10:28:36 +01:00
Florian Mortgat
8dfe39258b
FIX 11.0 - when a mandatory extrafield of type sellist contains '0' it should be considered empty and trigger an error message upon insertion
2021-01-27 23:46:09 +01:00
Frédéric FRANCE
7cd698aff9
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-26 20:19:49 +01:00
Adrien Raze
6ab63a10d6
FIX : Linked extrafields don't work with string value
2021-01-26 09:37:28 +01:00
Laurent Destailleur
0861c639ae
Fix sql injection
2021-01-25 12:40:52 +01:00
Laurent Destailleur
470cd5c682
Clean code
2021-01-25 12:39:44 +01:00
Laurent Destailleur
0f5fc7353e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/index.php
htdocs/admin/mailing.php
htdocs/admin/paymentbybanktransfer.php
htdocs/admin/prelevement.php
htdocs/modulebuilder/template/admin/setup.php
2021-01-24 15:29:53 +01:00
Laurent Destailleur
c5bbaffb50
Fix look and feel v13
2021-01-23 19:50:04 +01:00
Laurent Destailleur
21e55d1542
NEW Can filter files in GED on status Shared/Not shared
2021-01-23 13:56:51 +01:00
Laurent Destailleur
791f5f3f62
Fix css
2021-01-23 13:50:06 +01:00
lmarcouiller
60d6de86f1
change of line 1346 because miss remove
2021-01-21 14:31:18 +01:00
Laurent Destailleur
af438624a6
Update commonobject.class.php
2021-01-21 13:21:22 +01:00
Laurent Destailleur
0a55ba32f8
Merge branch 'develop' into FIX/Linked_extrafields_10.0
2021-01-21 13:20:34 +01:00
Adrien Raze
645685d16e
FIX : Linked extrafields list
2021-01-20 18:39:18 +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
fd65a2adc1
FIX #15955
2021-01-19 16:04:21 +01:00
Laurent Destailleur
7cb8d5af55
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-19 12:25:28 +01:00
Laurent Destailleur
f54efca075
Clean code
2021-01-19 12:25:05 +01:00
Frédéric FRANCE
e8c4db2188
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-19 11:36:59 +01:00
Laurent Destailleur
01996261dc
Merge pull request #15985 from frederic34/codesyntax
...
code syntax
2021-01-19 11:29:18 +01:00
lmarcouiller
afab5a977a
dolgrap.class.php with frederic34 advices 2
2021-01-19 09:43:06 +01:00
lmarcouiller
d69e36c110
Merge branch 'develop#1' of github.com:Hystepik/dolibarr into develop#1
2021-01-19 09:11:29 +01:00
lmarcouiller
82b688a2b0
dolgrap.class.php with frederic34 advices
2021-01-19 09:10:15 +01:00
lmarcouiller
fd888be5e5
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-01-19 09:05:08 +01:00
Gauthier PC portable 024
e2abbbcece
Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects
2021-01-19 08:57:24 +01:00
Frédéric FRANCE
36eeef81bf
code syntax
2021-01-19 00:41:39 +01:00
David Bensel
9813cb430a
FIX: type 'sellist' not handled properly in showInputField and showOutputField
2021-01-18 19:14:12 +01:00
Gauthier PC portable 024
2cfaf5fbd6
NEW : add real payments on vat objects
2021-01-18 17:08:17 +01:00
David Bensel
85d63891d9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2021-01-18 17:33:22 +03:00
David Bensel
b777a0660c
FIX: type 'sellist' not handled properly in showInputField and showOutputField
2021-01-18 17:31:49 +03:00
Laurent Destailleur
5a4ab3d00e
Fix look and feel v13
2021-01-18 12:07:40 +01:00
stickler-ci
fe01f35207
Fixing style errors.
2021-01-18 10:33:46 +00:00
lmarcouiller
383281e5f3
New update of funnel of prospection
2021-01-18 11:32:02 +01:00
Laurent Destailleur
250b530b29
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
2021-01-18 11:07:46 +01:00
Laurent Destailleur
c69631d646
Fix css for multiselect component that are fist hidden
2021-01-18 11:05:02 +01:00
Frédéric FRANCE
f71d803da8
Merge remote-tracking branch 'upstream/develop' into codesyntax
2021-01-17 20:21:05 +01:00
Laurent Destailleur
62300689f8
Fix look and feel v13
2021-01-17 15:59:04 +01:00
Laurent Destailleur
4d42fa2a37
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formaccounting.class.php
2021-01-17 11:34:19 +01:00
Frédéric FRANCE
c8d1410e33
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-16 21:06:12 +01:00
Frédéric FRANCE
177b87da0d
Merge remote-tracking branch 'upstream/develop' into codesyntax
2021-01-16 17:58:01 +01:00
Laurent Destailleur
506d809712
FIX #15991
2021-01-16 17:50:02 +01:00
Laurent Destailleur
d67e0621dd
Merge pull request #15994 from andreubisquerra/develop
...
FIX Avoid php errors if negative var in Receipt Module
2021-01-16 17:25:40 +01:00
Laurent Destailleur
f2488a399e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-01-16 17:13:54 +01:00
Laurent Destailleur
cdcc6b7324
Merge pull request #15974 from frederic34/davadmin
...
fix trans
2021-01-16 17:13:37 +01:00
Laurent Destailleur
ab1e49ab20
Merge pull request #15986 from aspangaro/13a27
...
Optimize select_auxaccount
2021-01-16 16:59:20 +01:00
Laurent Destailleur
8c8ffa3daf
Fix default limit
2021-01-16 16:56:49 +01:00
Laurent Destailleur
04e669ec96
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/langs/fr_FR/other.lang
2021-01-16 15:38:34 +01:00
Laurent Destailleur
892bd432e4
Fix crop of image on invoices.
2021-01-16 15:35:15 +01:00
Frédéric FRANCE
2df0acd419
code syntax
2021-01-16 14:12:09 +01:00
Frédéric FRANCE
871f762546
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-16 13:58:27 +01:00
Laurent Destailleur
4864808e4d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
2021-01-16 13:45:34 +01:00
Laurent Destailleur
b3d7783a29
Fix multicompany compatibility of preview of file in email form
2021-01-16 13:41:27 +01:00
andreubisquerra
2f9f933ea8
FIX Avoid php errors if negative var in Receipt Module
2021-01-15 19:28:12 +01:00
Laurent Destailleur
32bd194f8e
Sort array
2021-01-15 17:47:14 +01:00
Laurent Destailleur
4b66f6bcd3
Restrict list to customer and supplier only
...
Merge 2 sql request in to 1
2021-01-15 17:43:54 +01:00
Alexandre SPANGARO
0904212c0b
Better works
2021-01-15 14:19:41 +01:00
Laurent Destailleur
39b6f2fb6a
Revert. restore old behaviour, the picto before the input field lead to
...
confusion for some users and break presentation with some pages
2021-01-15 13:36:24 +01:00
Laurent Destailleur
dc9cd28437
Look and feel v14
2021-01-15 13:14:21 +01:00
Laurent Destailleur
4c50f25c12
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-15 11:41:45 +01:00
Alexandre SPANGARO
e812c200c5
Optimize select_auxaccount
2021-01-15 03:37:17 +01:00
Laurent Destailleur
0d704b0714
FIX error managent and db transaction balance
2021-01-14 19:09:57 +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
Laurent Destailleur
d76aab4d08
Clean code and comment to have code easier to undestand.
2021-01-14 10:56:24 +01:00
Frédéric FRANCE
923a5fe2a5
Merge remote-tracking branch 'upstream/develop' into davadmin
2021-01-13 18:45:29 +01:00
Laurent Destailleur
43161be711
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-13 17:45:38 +01:00
Laurent Destailleur
0af5c9ae91
Fix phpcs
2021-01-13 17:45:17 +01:00
Frédéric FRANCE
40a45efb63
fix code
2021-01-13 16:23:54 +01:00
Frédéric FRANCE
cb7266d261
fix trans
2021-01-13 16:18:23 +01:00
Laurent Destailleur
b7402ecf3f
Merge branch 'develop' into NEW_product_customer_price_ref
2021-01-13 13:38:19 +01:00
Laurent Destailleur
015c5a028b
Doxygen
2021-01-13 12:45:23 +01:00
Laurent Destailleur
1571b0496c
Merge pull request #15794 from atm-gauthier/develop_new_workstation
...
NEW : Workstations management
2021-01-13 12:19:38 +01:00
Frédéric FRANCE
e2c57584b7
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-12 23:47:24 +01:00
Frédéric FRANCE
dad329602a
Update html.formmail.class.php
2021-01-12 23:46:29 +01:00
Marc de Lima Lucio
82b0f18378
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref
2021-01-12 15:10:15 +01:00
Laurent Destailleur
2e9f3b803d
Add some hooks to add new buttons (compensation of removal of tabs).
...
Signed-off-by: Laurent Destailleur <eldy@destailleur.fr>
2021-01-12 13:59:20 +01:00
Florian HENRY
98eff62aff
Merge branch '13_backport' into dev_fix_contact_bulk
2021-01-12 10:25:18 +01:00
Florian HENRY
e34a797899
Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13_backport
2021-01-12 10:21:35 +01:00
Laurent Destailleur
3906acc951
Must use the generic version
2021-01-12 10:00:05 +01:00
Florian HENRY
21e1d5c8c9
Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13_8fablab
2021-01-11 18:07:10 +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
5bd59cd6d1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-11 13:37:59 +01:00
Laurent Destailleur
8debb58f7c
Fix rounding of currency unit prices
2021-01-11 13:36:53 +01:00
Gauthier PC portable 024
6668cfa311
FIX : name in copyrights
2021-01-11 11:40:04 +01:00
Gauthier PC portable 024
e3e4f0590c
FIX : get and delete linked items with association tables methods created in common object
2021-01-11 11:36:19 +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
77933de467
Merge branch '12.0' into FIX_12.0_date_extrafields_are_not_filterable_on_lists
2021-01-08 09:08:52 +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
55b46ca149
Merge pull request #15318 from bafbes/abb120353
...
New: add notification on ACTION_CREATE event
2021-01-07 11:17:33 +01:00
Laurent Destailleur
4f55d51eac
Merge pull request #15886 from FHenry/dev_add_column_propal_order
...
NEW : Column shippement method, payment mode, payment term in propal and order list
2021-01-07 11:04:30 +01:00
Laurent Destailleur
3d2dc59468
Merge pull request #15897 from OPEN-DSI/add_triggers_on_object_link_managment
...
NEW : Add triggers in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked()
2021-01-07 10:49:06 +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
c2855d4d71
Update html.form.class.php
2021-01-07 10:32:23 +01:00
Frédéric FRANCE
1e8362575a
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-06 21:05:59 +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
kamel
32109de67b
NEW : Add triggers OBJECT_LINK_INSERT, OBJECT_LINK_UPDATE et OBJECT_LINK_DELETE in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked()
2021-01-06 11:14:13 +01:00
Florian HENRY
6e7172887a
Merge branch '13_backport' into dev_add_column_propal_order
2021-01-05 22:58:00 +01:00
Florian HENRY
b9bb48a01f
better place and noadmininfo
2021-01-05 22:50:54 +01:00
Marc de Lima Lucio
f03f5701f6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref
2021-01-05 16:01:31 +01:00
Florian HENRY
f953ff0334
fix sticker
2021-01-05 15:25:47 +01:00
Florian HENRY
a2a45c6aa0
fix sticker
2021-01-05 15:22:31 +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
Laurent Destailleur
7efd8add39
Merge pull request #15878 from frederic34/patch-10
...
doxygen
2021-01-05 01:41:02 +01:00
Frédéric FRANCE
eeaac549e2
doxygen
2021-01-05 00:11:19 +01:00
Frédéric FRANCE
c468db5a7c
doxygen
2021-01-04 23:41:20 +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
Frédéric FRANCE
8454100e7a
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-04 17:45:36 +01:00
Laurent Destailleur
c58451dbb6
Code comment
2021-01-04 16:07:54 +01:00
Laurent Destailleur
b3142c3250
Merge pull request #15859 from frederic34/htmlformmail_doxygen
...
doxygen
2021-01-04 14:08:51 +01:00
Laurent Destailleur
8baa4c67ae
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-04 12:34:09 +01:00
Laurent Destailleur
b0738643fb
FIX Solve problem with TZ
2021-01-03 18:42:45 +01:00
Florian HENRY
dfaf77b03f
merge develop
2021-01-03 15:14:34 +01:00
Frédéric FRANCE
5dd0b3b1c6
can add box on user home page
2021-01-02 20:20:22 +01:00
Frédéric FRANCE
6fad38db57
can add box on member index page
2021-01-02 20:04:40 +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
3b7f5a92cb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
2021-01-02 17:20:24 +01:00
Frédéric FRANCE
eb937f82c8
doxygen
2021-01-02 16:58:05 +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
Frédéric FRANCE
b71e837ddd
clean code
2021-01-02 10:18:58 +01:00
Frédéric FRANCE
2894dac221
clean code
2021-01-02 10:17:11 +01:00
Frédéric FRANCE
5e692fa9db
doxygen
2021-01-02 09:47:29 +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
0241817217
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-01 21:12:36 +01:00
Laurent Destailleur
d834f6023d
Fix rounding
2020-12-31 16:06:54 +01:00
Regis Houssin
07dc29166e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
2020-12-30 13:56:50 +01:00
Laurent Destailleur
92a88441ac
Merge pull request #15328 from FHenry/dev_multifilter_jounal_on_bookeping
...
Dev multifilter jounal on bookeping
2020-12-30 13:19:27 +01:00
Laurent Destailleur
8149478c77
Merge pull request #15308 from aspangaro/14a2
...
NEW: Dictionary for availability - Add column position
2020-12-30 13:12:27 +01:00
Laurent Destailleur
17b68a30d7
Merge branch 'develop' into dev_add_tag_on_massaction
2020-12-30 13:10:02 +01:00
Regis Houssin
7832fa213f
FIX Stickler line exceeds 500 characters; contains 527 characters
2020-12-30 11:34:59 +01:00
Regis Houssin
7c5248d105
FIX and the world turn again
2020-12-30 11:27:03 +01:00
Regis Houssin
aec01a95fc
FIX again and again
2020-12-29 17:48:52 +01:00
Regis Houssin
acabb045fb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
2020-12-29 17:12:18 +01:00
Laurent Destailleur
cefd66c18f
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-29 16:56:39 +01:00
Regis Houssin
20cd9cbbc7
FIX avoid warning php 8.0
2020-12-29 16:25:29 +01:00
Regis Houssin
6e0832fb38
FIX WIP avoid warning with php 8.0
2020-12-29 15:59:39 +01:00
Alexandre SPANGARO
9f0434eb69
Merge remote-tracking branch 'upstream/develop' into 14a2
2020-12-29 04:50:32 +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
8b696ced3b
Clean code
2020-12-28 12:38:33 +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
1b6a4fc4ae
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_tag_on_massaction
2020-12-24 15:00:15 +01:00
Laurent Destailleur
5ef3ffbdc6
Fix warning
2020-12-24 03:03:38 +01:00
Laurent Destailleur
6c2a17b29a
Fix warning
2020-12-24 02:59:00 +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
02daf09928
Fix for php8
2020-12-23 23:06:34 +01:00
Laurent Destailleur
4471d7d1da
FIX debug report expense/income
2020-12-23 22:18:38 +01:00
Laurent Destailleur
d65dc85a10
FIX for php 8
2020-12-23 19:16:25 +01:00
Florian HENRY
311a555cc0
Merge github.com:Dolibarr/dolibarr into dev_exfields_of_lines_into_line_tr
2020-12-22 12:52:14 +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
Florian Mortgat
64a62bf2c2
FIX (PR #15346 comment) use dol_mktime, not mktime
2020-12-22 09:37:30 +01:00
Laurent Destailleur
04d249cef0
Merge pull request #15792 from frederic34/notifications
...
simplify notications class
2020-12-21 18:14:04 +01:00
Laurent Destailleur
7d0e71165a
Clean code
2020-12-21 14:40:27 +01:00
Laurent Destailleur
7fae5ea800
Code clean
2020-12-20 18:21:34 +01:00
Frédéric FRANCE
b7b35f4cd4
simplify notications class
2020-12-20 11:04:21 +01:00
Laurent Destailleur
8d21eab6ab
Fix buttond not working
2020-12-20 06:06:24 +01:00
Laurent Destailleur
6066a92b9d
Fix API to get country
2020-12-19 22:34:33 +01:00
Laurent Destailleur
fe93ee4d08
Debug website module for multilanguage
2020-12-19 13:03:40 +01:00
Laurent Destailleur
90d8299c92
Fix purge tool
2020-12-18 13:24:02 +01:00
Laurent Destailleur
3b8947dadd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/class/html.form.class.php
htdocs/product/price.php
2020-12-17 21:50:05 +01:00
Laurent Destailleur
f10c69680c
Ajax combo at a better place (after select)
2020-12-17 21:42:10 +01:00
Laurent Destailleur
a67068ab7b
Fix warnings
2020-12-17 18:08:56 +01:00
Laurent Destailleur
b0d524beed
Debug v13
2020-12-17 11:57:12 +01:00
Laurent Destailleur
05cb2653f3
Merge pull request #15749 from StephaneLesage/companycard-directedit-type
...
Direct edition of type of company in card
2020-12-15 13:54:06 +01:00
Laurent Destailleur
2ae1aac5a4
Fix setup
2020-12-15 11:18:29 +01:00
Laurent Destailleur
f2a4f880ca
Fix warning
2020-12-15 10:49:07 +01:00
David Bensel
bc9f7c83f4
update
2020-12-14 22:40:47 +03:00
Laurent Destailleur
9595504b56
Fix graph
2020-12-14 19:57:59 +01:00
stickler-ci
d32d3060cc
Fixing style errors.
2020-12-14 09:15:06 +00:00
Stephane Lesage
5e4cc7fcfd
companycard-directedit-typent
2020-12-14 10:14:31 +01:00
Laurent Destailleur
d739fa1951
Fix log
2020-12-13 18:32:55 +01:00
Laurent Destailleur
3d33d3aa3a
Fix warning
2020-12-13 14:36:00 +01:00
Frédéric FRANCE
346fe8ae85
clean
2020-12-12 22:35:51 +01:00
Laurent Destailleur
3521a736fc
Fix warnings
2020-12-12 19:49:13 +01:00
Frédéric FRANCE
4664ac1a1c
socialnetworks links
2020-12-12 17:00:23 +01:00
Laurent Destailleur
9100e1410e
Fix translation, add comments and clean code, fix also a small
...
regression on colors for graph with lines
2020-12-11 17:59:18 +01:00
stickler-ci
5d86a5bd2a
Fixing style errors.
2020-12-11 16:44:38 +00:00
Florian HENRY
79b0f08a8d
Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_project_task_add_contact
2020-12-11 17:38:59 +01:00
Florian HENRY
0ed084d585
NEW: When add contact/user to Project, ask to also affect on project task
2020-12-11 17:38:38 +01:00
Laurent Destailleur
18efbebd02
css
2020-12-11 17:11:50 +01:00
Laurent Destailleur
91ddcf6446
Merge pull request #15724 from Hystepik/develop#1
...
Close #15383 : New format for funnel of prospection
2020-12-11 16:31:46 +01:00
Laurent Destailleur
ab0b508984
Merge pull request #15720 from zuiko/patch-1
...
V13 Update html.form.class.php to complete Fix #15565 Enhanced behaviour to select product on customer/supplier order to be able to use barcode reader efficiently
2020-12-11 16:31:19 +01:00
Laurent Destailleur
8a0c065163
Debug v13
2020-12-11 16:30:45 +01:00
Laurent Destailleur
2353ade957
Merge pull request #15732 from frederic34/patch-14
...
fix phpcs
2020-12-11 14:36:04 +01:00
Laurent Destailleur
2adbd29b49
Debug generation of doc from modulebuilder
2020-12-11 14:22:36 +01:00
Frédéric FRANCE
54d51ec557
Update html.form.class.php
2020-12-11 13:46:47 +01:00
Frédéric FRANCE
eb2d7fa657
fix phpcs
2020-12-11 13:43:03 +01:00
Laurent Destailleur
697ca3e4f5
Fix selection of duration type
2020-12-11 02:23:43 +01:00
Laurent Destailleur
2f8ee92c51
Fix CSS
2020-12-11 02:02:41 +01:00
Laurent Destailleur
206caec290
Debug v13
2020-12-11 01:20:40 +01:00
Laurent Destailleur
1f28590e5e
Fix style
2020-12-10 19:05:54 +01:00
Laurent Destailleur
df4d2e1b24
Fix path of user photo
2020-12-10 18:13:30 +01:00
stickler-ci
38e03778dc
Fixing style errors.
2020-12-10 10:07:09 +00:00
lmarcouiller
ecd642e465
Close #15383 : New format for funnel of prospection
2020-12-10 10:58:07 +01:00
zuiko
b3ca58d2d0
Update html.form.class.php
...
Complete the Fix to #15565 Enhanced behaviour to select product on customer/supplier order to be able to use barcode reader efficiently.
Answer to Eldy, https://github.com/Dolibarr/dolibarr/pull/15704#discussion_r538763166
In fact the change alone to htdocs/core/lib/ajax.lib.php is not, for me, sufficient to fix the issue.
if $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, the combo remains even if the product is alone.
So I recommend that the code is $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, (wihout combo) for product selection only for customer order filling because for this usage the the probability is higher to use a barcode scanner.
It is less relevant for filling supplier orders (which are not usually entered by barcode scanner), because the combo gives verification information which then disappears. (This is especially true for the purchase price, which is not pre-filled in the box for the moment I tested(?).
2020-12-09 21:16:25 +01:00
lmarcouiller
83286d99be
funnel horizontal bar
2020-12-09 13:31:14 +01:00
Laurent Destailleur
769a8886b9
Debug notification on events
2020-12-08 20:32:37 +01:00
Laurent Destailleur
791d129c9c
Merge pull request #15699 from hregis/fix_bcc_only_if_not_exists
...
FIX add autocopy to if not already exists in $to
2020-12-08 17:56:04 +01:00
Laurent Destailleur
8491be2572
Fix look and feel v13
2020-12-08 11:58:47 +01:00
Regis Houssin
fc34c97666
FIX add autocopy to if not already exists in $to
2020-12-08 08:49:06 +01:00
Laurent Destailleur
efc3bad7c6
Merge pull request #15678 from frederic34/fk_element
...
doxygen
2020-12-07 22:31:08 +01:00
Laurent Destailleur
ffa866585a
Update emailsenderprofile.class.php
2020-12-07 22:29:17 +01:00
Laurent Destailleur
6e403e6ce0
Fix warnings
2020-12-07 18:29:14 +01:00
Laurent Destailleur
e77413e1e4
Fix warning
2020-12-07 15:36:37 +01:00
Laurent Destailleur
d1c66059cd
Add missing tag order_ref and order_ref_customer on shipments for ODT
...
generation.
Conflicts:
htdocs/core/class/commondocgenerator.class.php
2020-12-06 19:03:46 +01:00
Laurent Destailleur
025cbe8557
Add missing tag order_ref and order_ref_customer on shipments for ODT
...
generation.
2020-12-06 19:01:09 +01:00
Laurent Destailleur
de61a7cfd3
Fix cleaning html tags with trans and with GETPOST.
2020-12-06 17:30:27 +01:00
Laurent Destailleur
1f83e22aea
Fix set of translation of website page during cloning
2020-12-06 15:59:19 +01:00
Frédéric FRANCE
fbc0be3a43
doxygen
2020-12-05 23:57:31 +01:00
Frédéric FRANCE
4e18f46f28
doxygen
2020-12-05 23:53:55 +01:00
Laurent Destailleur
15455690b9
Fix setup
2020-12-05 14:06:50 +01:00
Laurent Destailleur
af1bb09338
NEW: Graphics can be horizontal bars.
2020-12-04 22:30:34 +01:00
Laurent Destailleur
d8b01d9a33
Fix chart is default graph lib
2020-12-04 22:12:20 +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
f0dec80dae
css
2020-12-04 15:39:30 +01:00
Laurent Destailleur
6d4a90b543
Clean code
2020-12-04 14:53:52 +01:00
Laurent Destailleur
040d22ef0a
Fix phpcs
2020-12-04 01:59:47 +01:00
Laurent Destailleur
5bd6d6f388
Look and feel v13
2020-12-03 14:34:15 +01:00
Laurent Destailleur
d88173d7ba
Fix bad column
2020-12-02 19:13:32 +01:00
Laurent Destailleur
9e18997e64
FIX #15595
2020-12-02 16:35:43 +01:00
Laurent Destailleur
49be354c3e
Fix warning
2020-12-02 14:05:17 +01:00
Laurent Destailleur
c5ff32c2d2
Fix accept <u> and <i> into translation strings
2020-12-01 17:01:35 +01:00
Laurent Destailleur
c0c03f5270
Fix allow tag <center> into translation strings
2020-12-01 15:59:54 +01:00
Laurent Destailleur
3b3f9acdbb
Remove warning
2020-12-01 11:36:58 +01:00
stickler-ci
7d966d7a49
Fixing style errors.
2020-12-01 01:42:18 +00: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
de718837e4
Fix warnings
2020-11-30 19:43:43 +01:00
Laurent Destailleur
c0baf483dc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-30 18:28:24 +01:00
Laurent Destailleur
3443174f67
Sync transifex
2020-11-30 18:28:04 +01:00
Laurent Destailleur
6f0d49d68d
Merge pull request #15578 from Tim-Otte/fix-product-supplier-price-extrafield
...
FIX for product supplier price extrafields
2020-11-30 15:44: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
bd5dc6399b
Fix deprecated code
2020-11-30 12:35:05 +01:00
Laurent Destailleur
4f2259ea38
Fix warning
2020-11-30 12:03:04 +01:00
Tim Otte
16b69a069e
Fixed sql error where column names were used instead of sql column names
2020-11-30 10:21:10 +01:00
Laurent Destailleur
150dd71774
Look and feel v13
2020-11-29 16:02:39 +01:00
Laurent Destailleur
404634919d
Look and feel v13
2020-11-29 15:47:08 +01:00
Laurent Destailleur
6c65ebef0d
Look and feel v13
2020-11-29 15:16:53 +01:00
Laurent Destailleur
fab9b3d50c
Fix warning
2020-11-28 18:34:13 +01:00
andreubisquerra
c9c2869eec
Fix travis
2020-11-27 19:45:40 +01:00
andreubisquerra
c3bc662675
Improve free entries printing in TakePOS
...
Improve free entries printing with Receipt Printer module in TakePOS
2020-11-27 19:24:27 +01:00
Laurent Destailleur
574919de52
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
2020-11-27 15:45:12 +01:00
Laurent Destailleur
4a5cdd0092
Several fixes in export and repair tool
2020-11-27 15:27:35 +01:00
Laurent Destailleur
ac3c129735
Clean code
2020-11-27 14:24:15 +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
47a5037155
Fix dolGetFirstLastname() for 4 and 5
2020-11-27 01:18:01 +01:00
Laurent Destailleur
97f6efb079
Fix avoid to trigger sql injection detection
2020-11-26 23:50:00 +01:00
Laurent Destailleur
b3b511a6d4
FIX #15546
2020-11-26 22:44:11 +01:00
Laurent Destailleur
5d9098795f
Fix labels in combo
2020-11-26 19:17:09 +01:00
Laurent Destailleur
084b2411df
Merge pull request #15550 from OPEN-DSI/new-supplier-product-list-with-stock
...
NEW show stock in supplier product select list
2020-11-26 18:56:04 +01:00
Laurent Destailleur
82da0d01f1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formorder.class.php
htdocs/fourn/commande/list.php
2020-11-26 18:52:00 +01:00
Laurent Destailleur
b043442b91
Fix link and selection of status of purchase order.
2020-11-26 17:53:57 +01:00
Laurent Destailleur
3588781180
Debug v13
2020-11-26 14:15:20 +01:00
lvessiller
17e13eb821
NEW show stock in supplier product select list
2020-11-26 14:12:02 +01:00
Laurent Destailleur
e272130a6a
Fix phpcs
2020-11-26 08:40:08 +01:00
Laurent Destailleur
74605cec12
Fix warning
2020-11-25 18:07:52 +01:00
Laurent Destailleur
4d90fb22de
Fix sql syntax error
2020-11-25 15:07:26 +01:00
Laurent Destailleur
5030f0c587
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/opensurvey/wizard/create_survey.php
2020-11-25 14:55:31 +01:00
Laurent Destailleur
bf7b6ee00d
Fix delete of proposal
2020-11-25 14:15:59 +01:00
Frédéric FRANCE
c09a6d1435
Merge remote-tracking branch 'upstream/develop' into patch-10
2020-11-25 12:59:32 +01:00
Frédéric FRANCE
0d24fc56b9
doxygen
2020-11-24 22:40:41 +01:00
Frédéric FRANCE
66ad0e5b13
add note on ecm files
2020-11-24 18:54:59 +01:00
Laurent Destailleur
81566289cd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
2020-11-24 11:07:35 +01:00
Laurent Destailleur
bc1d286673
Merge pull request #15495 from Givriz/dev
...
Feature : creation of a "button-cancel" class
2020-11-23 21:53:45 +01:00
Laurent Destailleur
5822fcfbed
FIX several warning with the barcode use in ODT templates
2020-11-23 21:38:45 +01:00
Laurent Destailleur
efc539c4b4
Fix css
2020-11-23 19:53:58 +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
Laurent Destailleur
2f6f242d99
CSS
2020-11-23 12:29:38 +01:00
Laurent Destailleur
7d1b84d482
Fix warning
2020-11-22 22:58:14 +01:00
Laurent Destailleur
af2eabb24d
Fix warning
2020-11-22 15:06:53 +01:00
Laurent Destailleur
f6d6efa288
CSS
2020-11-22 13:23:56 +01:00
Laurent Destailleur
986f918436
Fix image edition when gravatar module is on
2020-11-22 01:47:17 +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
60bfbe2e57
Merge pull request #15448 from Givriz/dev
...
Feature : creation of a "button-save" class
2020-11-21 23:44:30 +01:00
Laurent Destailleur
782e3b4c23
Merge pull request #15458 from frederic34/patch-23
...
doxygen
2020-11-21 23:42:56 +01:00
Laurent Destailleur
9004be1df2
Debug feature to send remind by email
2020-11-21 17:42:07 +01:00
Laurent Destailleur
3534555909
Fix setup of scheduled jobs
2020-11-21 14:14:53 +01:00
Damien BENOIT
ebd64d5e57
Merge pull request #5 from Dolibarr/develop
...
Update fork
2020-11-20 13:53:43 +01:00
Laurent Destailleur
07c192efb8
Merge pull request #15457 from frederic34/patch-22
...
Update ldap.class.php
2020-11-20 13:37:24 +01:00
Frédéric FRANCE
b4a5134a7f
doxygen
2020-11-19 22:25:02 +01:00
Frédéric FRANCE
5d4d7c99d6
Update ldap.class.php
...
The variable $result seems to be never defined.
2020-11-19 22:07:32 +01:00
Frédéric FRANCE
efa5c89c45
Update rssparser.class.php
...
The variable $**** does not seem to be defined for all execution paths leading up to this point.
2020-11-19 22:03:13 +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
e78b9a421d
Fix sql
2020-11-18 13:14:29 +01:00
Laurent Destailleur
17f35e16b9
Merge pull request #15436 from OPEN-DSI/add_extended_infos_on_select_contacts
...
NEW: Add new option for displaying Contact email (or phones if not defined) and town info list (select list or combobox)
2020-11-18 13:12:03 +01:00
Laurent Destailleur
ce173d7b39
Merge pull request #15424 from Tim-Otte/fix-15423
...
Fix for #15423
2020-11-18 12:46:41 +01:00
Laurent Destailleur
a5a7197506
Update extrafields.class.php
2020-11-18 12:45:37 +01:00
Laurent Destailleur
166bb5cc75
Merge pull request #15421 from frederic34/patch-8
...
fix dir for member photo in odt tag
2020-11-18 12:37:03 +01:00
Laurent Destailleur
889a5d0be1
Update commondocgenerator.class.php
2020-11-18 12:04:41 +01:00
kamel
73b35f334e
NEW: Add new option for displaying Contact email (or phones if not defined) and town info list (select list or combobox)
...
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
2020-11-18 09:41:42 +01:00
Laurent Destailleur
17f78f9cec
FIX Protection to avoid duplicate submit when creating a payment.
2020-11-17 18:39:34 +01:00
Laurent Destailleur
6bbeb6d3a0
Fix debug creation of shipment with virtual product.
2020-11-16 16:31:05 +01:00
Laurent Destailleur
ac5fa6c6df
Clean code
2020-11-16 12:54:16 +01:00
Laurent Destailleur
65144f4d5a
fix warning
2020-11-16 11:37:28 +01:00
Tim Otte
4a1f61d759
Fix for #15423
2020-11-16 11:12:43 +01:00
Frédéric FRANCE
8cff0222cd
Update commondocgenerator.class.php
2020-11-15 23:58:35 +01:00
Frédéric FRANCE
35653bb855
fix dir for member photo in odt tag
2020-11-15 23:45:13 +01:00
Laurent Destailleur
89a77fad2c
Fix warning
2020-11-15 16:56:30 +01:00
Laurent Destailleur
2e0e42e918
Fix warning
2020-11-15 14:37:21 +01:00
Frédéric FRANCE
0a5e041775
Merge remote-tracking branch 'upstream/develop' into odtformembers
2020-11-14 00:56:21 +01:00
Laurent Destailleur
7da2d6cda2
Merge pull request #15391 from frederic34/patch-8
...
doxygen
2020-11-14 00:48:52 +01:00
Frédéric FRANCE
4ca3c0aa95
Add odt for members
2020-11-14 00:48:13 +01:00
Laurent Destailleur
3c5ef18b36
FIX #15390
2020-11-14 00:47:28 +01:00
Frédéric FRANCE
42ddf7e27b
doxygen
2020-11-13 20:45:03 +01:00
Laurent Destailleur
5498800ad6
Update commonobject.class.php
2020-11-13 10:02:34 +01:00
Günter Lukas
2da8fb75a8
Fix #15371
...
Extrafields from type "select" depending on other fields not working in Safari & jquery select2 #15371
2020-11-12 15:59:42 +01:00
Laurent Destailleur
1dbc91e343
Clean code
2020-11-12 13:44:57 +01:00
Laurent Destailleur
767f07d02e
Debug function to show list of files in ECM module
2020-11-11 22:47:06 +01:00
Laurent Destailleur
03e60bf084
Fix warning
2020-11-11 20:27:21 +01:00
Laurent Destailleur
90884d8085
Fix compatibility with date_delivery
2020-11-11 18:08:40 +01:00
Florian Mortgat
952f398a60
Apply stickler CI recommendation to avoid concatenating string literals
2020-11-10 23:50:42 +01:00
Laurent Destailleur
db08786ddf
Add missing properties
2020-11-10 20:13:54 +01:00
Florian Mortgat
a64c4b0cb5
support for $moreparam
2020-11-10 17:29:03 +01:00
Florian Mortgat
2c1d4049be
Enable list filtering on date and datetime extrafields
2020-11-10 17:24:17 +01:00
Laurent Destailleur
29f0a9b784
Fix in select of user when firstname and lastname is empty
2020-11-10 15:03:35 +01:00
Laurent Destailleur
f8ddad4d4c
Fix warning
2020-11-10 13:20:45 +01:00
Alexandre SPANGARO
82d1f99010
Merge remote-tracking branch 'upstream/develop' into 14a2
2020-11-10 04:09:00 +01:00
Bahfir Abbes
f4566fe0f1
fix:link name
2020-11-09 22:20:20 +01:00
Scrutinizer Auto-Fixer
f6e3f58fcb
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-11-09 14:18:56 +00:00
Laurent Destailleur
0f90cee597
Fix missing fields
2020-11-09 15:15:21 +01:00
Laurent Destailleur
5be634cbd4
Clean code
2020-11-09 11:34:58 +01:00
Laurent Destailleur
807d3b99c9
Fix update field when visilbity is 4 or -4
2020-11-09 09:53:56 +01:00
Laurent Destailleur
310123fe33
Merge pull request #15331 from Ahuahuachi/develop
...
NEW Allow disable multiple file upload in form_attach_new_file method
2020-11-08 12:38:29 +01:00
Laurent Destailleur
e103503bb1
Fix warning php8
2020-11-08 12:34:45 +01:00
Alfredo Altamirano
f57c6dd25e
Add $disablemulti option to form_attach_new_file method
...
This new option allows to disable multiple file upload for use on specific upload forms
2020-11-07 18:03:55 -06:00
Laurent Destailleur
9d3a25e2a3
Doxygen
2020-11-08 00:35:10 +01:00
Florian HENRY
312438d62a
Merge branch 'dev_multifilter_jounal_on_bookeping' of github.com:FHenry/dolibarr into dev_multifilter_jounal_on_bookeping
2020-11-07 15:48:39 +01:00
Florian HENRY
58cb63adf7
fix stockler
2020-11-07 15:48:12 +01:00
stickler-ci
259462b53a
Fixing style errors.
2020-11-07 14:36:28 +00:00
Florian HENRY
1bdd617feb
NEW: Multiselect ledger account code filter on book keeping list
2020-11-07 15:31:27 +01:00
Laurent Destailleur
c071dd254b
Fix warning
2020-11-07 14:35:28 +01:00
Laurent Destailleur
a72107ce06
Fix regression
2020-11-07 14:33:21 +01:00
Laurent Destailleur
2fdba3ad46
Fix warning
2020-11-07 12:53:52 +01:00
Laurent Destailleur
2da6fc1ef0
Remove warning
2020-11-07 12:06:14 +01:00
Laurent Destailleur
fe8d93f72d
Fix phpcs
2020-11-07 01:17:54 +01:00
Laurent Destailleur
c097e140cc
Fix php8
2020-11-06 15:41:34 +01:00
Laurent Destailleur
ac6f8e4e7c
Debug v13
2020-11-06 11:52:48 +01:00
bahfir abbes
11099132da
New: add notification on ACTION_CREATE event
2020-11-06 00:48:23 +01:00
Alexandre SPANGARO
61bca50fa6
NEW: Dictionary for availability - Add column position
2020-11-05 16:56:28 +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
824b778d51
Update commonobject.class.php
2020-11-05 09:07:06 +01:00
Francis Appels
5866facf11
Update commonobject.
...
Don't think $fk_delivery_address is deprecated, also no alternative indicated.
Switch of implode paramenters.
showInputField preselected value for array type can be array.
2020-11-04 20:31:55 +01:00
jcp
1f483d7c28
Fix force payment mode to create withdrawal
2020-11-04 11:43:03 +01:00
Laurent Destailleur
b0e2d40533
Debug and fix v13
2020-11-03 14:19:54 +01:00
Laurent Destailleur
5f290e0de1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-02 11:41:19 +01:00
Laurent Destailleur
83a7b19333
Look and feel v13
2020-11-02 11:41:07 +01:00
Laurent Destailleur
ea3106cd07
Merge pull request #15252 from frederic34/specimencommon
...
initSpecimenCommon
2020-11-02 09:29:48 +01:00
Laurent Destailleur
878b8f25de
Update commonobject.class.php
2020-11-02 09:29:26 +01:00
Frédéric FRANCE
a1016d79a2
initSpecimenCommon
2020-11-01 20:33:06 +01:00
Laurent Destailleur
ce7a96cbf1
Add more assertion
2020-11-01 20:11:09 +01:00
Laurent Destailleur
e0ed89c514
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/compta/facture/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/product/class/product.class.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
2020-11-01 17:58:41 +01:00
Laurent Destailleur
63a03cdad6
FIX #15208
2020-11-01 14:34:29 +01:00
Laurent Destailleur
4feed10b75
Merge pull request #15246 from hregis/develop_bug2
...
FIX to avoid error with geoip
2020-11-01 13:54:58 +01:00
Regis Houssin
e19e56e14c
FIX to avoid error with geoip
2020-11-01 10:47:54 +01:00
Frédéric FRANCE
d9bf49c5dc
phpcs
2020-10-31 21:04:38 +01:00
Scrutinizer Auto-Fixer
ab25e047c0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
Laurent Destailleur
125b94d749
Merge pull request #15234 from frederic34/patch-8
...
doxygen
2020-10-31 15:05:41 +01:00
stickler-ci
284c9bc6a8
Fixing style errors.
2020-10-31 13:34:01 +00: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
Frédéric FRANCE
78b94c775b
Update commonobject.class.php
2020-10-31 13:59:46 +01:00
Laurent Destailleur
11f9c4cfbd
Merge pull request #15117 from atm-jpb/develop_editorRate
...
# New multi-currency exchange rate editor
2020-10-31 13:55:42 +01:00
Laurent Destailleur
1af3709793
Merge pull request #15232 from frederic34/patch-6
...
doxygen
2020-10-31 13:50:28 +01:00
Laurent Destailleur
2b09b7be8e
Fix css
2020-10-31 13:47:50 +01:00
Frédéric FRANCE
85b3b5de36
Update commonobject.class.php
2020-10-31 13:24:09 +01:00
Laurent Destailleur
cea61d3b52
Fix var
2020-10-31 12:44:14 +01:00
Laurent Destailleur
a24071492e
Start fix for php8 compatibility
2020-10-30 05:56:07 +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
840ca73464
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/class/hookmanager.class.php
htdocs/main.inc.php
htdocs/theme/eldy/info-box.inc.php
htdocs/theme/eldy/style.css.php
2020-10-30 04:21:07 +01:00
Laurent Destailleur
f5a156ee06
Fix regression
2020-10-30 04:17:02 +01:00
Laurent Destailleur
1b5bcaccc6
Fix remove warnings
2020-10-30 04:13:31 +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
Laurent Destailleur
8c646cdf4f
Merge pull request #15207 from frederic34/patch-11
...
Mutualise code, introduce MAIN_ALL_TOWN_TO_UPPER
2020-10-29 17:49:16 +01:00
Regis Houssin
032813fa19
FIX extrafield date not recover in create/edit mode
2020-10-29 11:05:45 +01:00
Frédéric FRANCE
4d716e74bd
Mutualise code, introduce MAIN_ALL_TOWN_TO_UPPER
2020-10-28 19:06:45 +01:00
Scrutinizer Auto-Fixer
208740c9c4
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-28 16:49:52 +00:00
Laurent Destailleur
f760b20bde
Fix double semi colon
2020-10-28 17:48:20 +01:00
Florian Mortgat
a4af2e94a9
FIX 10.0 - make formConfirm an addreplace-type hook
2020-10-28 17:08:09 +01:00
Marc de Lima Lucio
ca2ed2ef74
NEW: ref in product customer price: look for products with customer ref
2020-10-28 11:04:15 +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
Scrutinizer Auto-Fixer
a2a9c51e50
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-27 18:46:07 +00: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
Laurent Destailleur
e099507594
Fix regression
2020-10-27 18:53:03 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end
2020-10-27 18:19:31 +01:00
Laurent Destailleur
fe357e17e8
Fix for ja
2020-10-27 11:00:50 +01:00
Florian HENRY
2c772cd8bb
try to make it work for experimental PRODUIT_CUSTOMER_PRICES_BY_QTY option
2020-10-27 09:52:04 +01:00
Laurent Destailleur
efce53abd1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/boxes/box_services_contracts.php
htdocs/expensereport/class/expensereport.class.php
2020-10-26 18:17:23 +01:00
Laurent Destailleur
2c2142ddba
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-10-26 18:13:47 +01:00
Laurent Destailleur
adeddc70ca
FIX Deletion of expensereport + other generated object not complete.
2020-10-26 18:10:58 +01:00
Florian HENRY
76824c868b
clean get price for fourn and labal for supplier coducment
2020-10-26 16:31:07 +01:00
Laurent Destailleur
2638d4596a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/actions_sendmails.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/facture/card.php
2020-10-25 21:33:13 +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
6fa174d13f
Merge pull request #15051 from laudeco/feature/11878_select_bank_account
...
11878 - select the only bank account
2020-10-25 14:56:08 +01:00
Laurent Destailleur
dbf626b92b
Update html.form.class.php
2020-10-25 14:55:52 +01:00
Laurent Destailleur
e7743948cb
Merge pull request #15120 from frederic34/patch-6
...
Update commonobject.class.php
2020-10-25 14:50:56 +01:00
Laurent Destailleur
4d9c8e2225
Merge pull request #15124 from frederic34/retrieve
...
retrieve the spelling
2020-10-25 14:48:51 +01:00
Laurent Destailleur
c6cee2f96f
Merge pull request #15128 from frederic34/patch-11
...
doxygen
2020-10-25 14:34:15 +01:00
Laurent Destailleur
bb147d2599
FIX #15140
2020-10-25 14:12:34 +01:00
Maxime Kohlhaas
bedfb7ac8d
Fix BOM position field
2020-10-24 19:19:06 +02:00
Laurent De Coninck
1d62834b2c
use the second version for default bank account
2020-10-24 17:15:48 +02:00
Frédéric FRANCE
3d3b530357
doxygen
2020-10-23 22:24:20 +02:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉
2020-10-23 20:08:35 +02:00
Frédéric FRANCE
c3863aeed8
Update commonobject.class.php
2020-10-23 18:18:01 +02:00
Laurent Destailleur
50da1cd95e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-10-23 17:33:57 +02:00
Laurent Destailleur
cf4ea4168d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/extrafields.class.php
2020-10-23 17:33:14 +02:00
Laurent Destailleur
f00fa93903
FIX check on required field when updating 1 extrafields.
2020-10-23 17:31:17 +02:00
Laurent Destailleur
377c44eeab
Merge pull request #14656 from OPEN-DSI/v10-fix-extrafields-select-required
...
FIX no empty value in required extrafield
2020-10-23 17:29:12 +02:00
Laurent Destailleur
572637b726
Enhance update of 1 extrafield (simple update instead of delete+insert)
2020-10-23 15:31:13 +02:00
jpb
47351c3cb3
Fix : stickler-ci
2020-10-23 13:55:55 +02:00
jpb
63c82b47fe
Merge branch '11.0_currencyRateEditor' of github.com:atm-jpb/dolibarr into develop_editorRate
2020-10-23 12:27:14 +02:00
jpb
1ecff0a608
add list and crud
2020-10-23 11:58:25 +02:00
Laurent Destailleur
81543df5e4
Fix warnings
2020-10-23 04:24:54 +02:00
Laurent Destailleur
0a1e49447d
Merge pull request #15108 from frederic34/patch-4
...
Update cproductnature.class.php
2020-10-23 04:07:03 +02:00
stickler-ci
5638a49774
Fixing style errors.
2020-10-22 22:23:03 +00:00
Frédéric FRANCE
43bb812260
Update cproductnature.class.php
2020-10-23 00:22:34 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated
2020-10-22 22:50:03 +02:00
Frédéric FRANCE
ed8bfa26fb
Update cproductnature.class.php
2020-10-22 22:20:48 +02:00
Laurent Destailleur
fb7202b7f8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-22 17:55:47 +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
9c9d468a18
Merge pull request #15052 from andreubisquerra/master
...
TakePOS connector compatibility with templates
2020-10-22 16:11:16 +02:00
Florian HENRY
d4fd71d0b3
fix #14649
2020-10-20 19:58:11 +02:00
Laurent Destailleur
ef182bed07
Fix browser reminder
2020-10-18 14:00:47 +02:00
jove@bisquerra.com
1283c6e095
TakePOS connector compatibility with templates
2020-10-18 09:29:33 +02:00
Laurent De Coninck
d2e2cad028
select by default, remove the show empty everywhere the field is required
2020-10-17 21:15:52 +02:00
Laurent Destailleur
547b3602cc
FIX refresh of tasks combo must use an ajax page not a full html page
2020-10-17 21:14:19 +02:00
Laurent De Coninck
cea7fd6894
select the only bank account
...
When there is only one bank account in the dropdown of the bank account,
select it by default.
[see: #11878 ]
2020-10-17 20:45:37 +02:00
Laurent Destailleur
f2fafe04b6
Update doc
2020-10-17 18:16:03 +02:00
Laurent Destailleur
7b20e703ee
Clean code
2020-10-17 15:53:31 +02:00
Laurent Destailleur
20b6d3828e
NEW Show image of user in the combo select of users
2020-10-17 13:27:39 +02:00
Laurent Destailleur
5df1218d9f
Enhance page to setup email templates
2020-10-17 12:59:22 +02:00
Laurent Destailleur
e3552e7e02
Clean code
2020-10-16 20:17:54 +02:00
Laurent Destailleur
67785887fd
Merge pull request #15035 from andreubisquerra/master
...
Change the tag char for security reasons in 'Receipt Printer' module
2020-10-16 17:20:04 +02:00
Laurent Destailleur
e74b833d7f
Look and feel v13
2020-10-16 15:40:52 +02:00
Laurent Destailleur
7504f92a41
Standardize code and look and feel
2020-10-16 13:30:20 +02:00
Laurent Destailleur
5905d3be64
Fix phpcs
2020-10-16 00:06:26 +02:00
jove@bisquerra.com
f90b236e0f
Change the tag char for security reasons in 'Receipt Printer' module
2020-10-15 23:44:13 +02:00
Laurent Destailleur
64b1a31e45
Merge pull request #15018 from FHenry/dev_add_dict_NatureOfProductType
...
NEW : Nature of product is now a dictionay
2020-10-15 21:07:42 +02:00
Laurent Destailleur
9bbb471b4f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/stats/cabyprodserv.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/loan/card.php
2020-10-15 20:51:30 +02:00
Laurent Destailleur
5b37ff0bfd
Html entities use now HTML5. Enhance the Dolibarr WAF. More PHPUnit
...
tests.
2020-10-15 19:36:08 +02:00
Laurent Destailleur
844c4dec4d
css
2020-10-15 13:16:17 +02:00
stickler-ci
05ac7c91c7
Fixing style errors.
2020-10-14 16:25:23 +00:00
Florian HENRY
4fd32325d6
cast int
2020-10-14 18:22:55 +02:00
Florian HENRY
bcb98d1d67
Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType
2020-10-14 18:16:34 +02:00
Laurent Destailleur
c079076488
Merge pull request #15010 from bafbes/abb120147
...
fix:allow const files loading from modules inside custom folders
2020-10-14 17:39:08 +02:00
Florian HENRY
fd1fa1c777
Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType
2020-10-14 16:39:54 +02:00
Florian HENRY
7d09f22afa
add correct import and dict edition
2020-10-14 16:39:42 +02:00
Florian HENRY
a2ef7bc61e
add select
2020-10-14 14:26:40 +02:00
Laurent Destailleur
a0b17635fd
NEW When creating a user from a member linked to a thirdparty, you can
...
decide if it is an internal or external (default) user.
2020-10-14 14:02:07 +02:00
Laurent Destailleur
7838ca32ba
Fix sql injection reported by Jason Nordenstam
2020-10-14 01:52:53 +02:00
bahfir abbes
4ee6cedbe6
Option d’Activation du fichier global de configuration.
2020-10-13 23:33:25 +01:00
Laurent Destailleur
d3b6ada4eb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/stats/cabyprodserv.php
2020-10-13 15:08:53 +02:00
Laurent Destailleur
bc6b5d919a
Better responsive
2020-10-13 10:51:51 +02:00
Laurent Destailleur
7c67dbf6d5
Better responsive
2020-10-13 10:05:47 +02:00
Laurent Destailleur
66a6415230
Merge pull request #14994 from grandoc/new_branch_12_10_2020
...
fix : undefined index
2020-10-12 19:37:37 +02:00
Laurent Destailleur
fcd4645509
Standardize code: Property product_libelle renamed into product_label
...
Move common vars declaration into parent class.
2020-10-12 19:33:00 +02:00
Philippe GRAND
4da75c4251
fix : undefined index
2020-10-12 16:11:56 +02:00
Laurent Destailleur
726fd1b631
Merge pull request #11227 from aspangaro/10.0_intracommreport
...
NEW module Intracomm report
2020-10-12 13:35:58 +02:00
Laurent Destailleur
29f19d9550
Merge pull request #14964 from TobiasSekan/MoreFilterOnLeaveLog
...
NEW More filter for "View change logs"
2020-10-10 15:35:55 +02:00
Alexandre SPANGARO
8876457b54
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-10-10 06:47:05 +02:00
Alexandre SPANGARO
4dcd2bfcda
Fix Travis
2020-10-09 13:58:35 +02:00
Laurent Destailleur
1239152368
Update dolgraph.class.php
2020-10-09 13:54:47 +02:00
Regis Houssin
b591e6510b
FIX avoid warning "Parameter must be an array"
2020-10-09 11:03:44 +02:00
Alexandre SPANGARO
b3b37dd9ee
Fix sticklerCI
2020-10-09 09:32:50 +02:00
Alexandre SPANGARO
ca7ad35342
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-10-09 06:39:42 +02:00
Laurent Destailleur
e7c456f6f2
NEW Add column payment term into list of supplier invoices.
2020-10-08 19:22:21 +02:00
Laurent Destailleur
047d6f78e7
Fix status disabled of task intocombo list
2020-10-08 17:49:26 +02:00
Aurélien
b6283c1a5d
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery
2020-10-08 16:19:10 +02:00
Sekan, Tobias
7e3a3a4cf3
Add more filter for leave log view
2020-10-08 10:30:09 +02:00
Laurent Destailleur
eb41a72e27
Properties ->titre have been renamed into ->title
2020-10-07 17:41:36 +02:00
Laurent Destailleur
c7ca99accb
Fix default value of enabled property of menu entry
2020-10-07 15:38:07 +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
84105e996a
Fix for #14940
2020-10-07 01:03:48 +02:00
Laurent Destailleur
ea8ec4ea90
Clean code
2020-10-07 00:59:05 +02:00
Laurent Destailleur
77788a0591
Clean code
2020-10-07 00:26:03 +02:00
Laurent Destailleur
2c5d396546
Fix upload file
2020-10-06 17:45:08 +02:00
Laurent Destailleur
663f149982
Better error management
2020-10-06 16:48:48 +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
Aurélien
c8cd55e158
debug access right after rename class #14697
2020-10-06 15:57:50 +02:00
Aurélien
1af42b313c
rename livraison pdf and dependencies #14697
2020-10-06 13:32:02 +02:00
Aurélien
af7c23b2ac
rename folder admin/livraison.php and dependencies #14697
2020-10-06 12:05:24 +02:00
lvessiller
496150d747
FIX extrafield required error after submit
2020-10-06 10:21:24 +02:00
Laurent Destailleur
e5cdffcdec
Merge pull request #14922 from andreubisquerra/develop
...
TakePOS connector compatibility with RECEIPT PRINTERS module
2020-10-05 16:38:56 +02:00
Laurent Destailleur
cfc3c01815
Factorize code to know if a parameter is used to store a secret
2020-10-05 12:13:06 +02:00
Laurent Destailleur
62177edab1
NEW Can force the antivirus from conf file or autoprepend ini setup.
2020-10-05 05:00:59 +02:00
Laurent Destailleur
800c0d2b00
Fix method must return a string not print on output
2020-10-05 02:24:45 +02:00
andreubisquerra
65c6881fc9
NEW: TakePOS connector compatibility with RECEIPT PRINTERS module
2020-10-04 22:49:47 +02:00
Laurent Destailleur
581a3d8808
FIX Add a better message when file size is too large
2020-10-03 14:02:53 +02:00
Laurent Destailleur
1a535dc77b
Clean code
2020-10-02 19:00:15 +02:00
Laurent Destailleur
bc308fc662
Look and feel v13 - Disabled users are greyed
2020-10-02 14:19:44 +02:00
Laurent Destailleur
3c6fcced8e
Clean code
2020-10-02 13:38:35 +02:00
Laurent Destailleur
86c9c28e7c
Merge pull request #14895 from hregis/12.0_ldap
...
FIX missing hook 'formConfirm' in 'addreplace' $hooktype
2020-10-02 13:33:35 +02:00
Regis Houssin
f67189aaa8
FIX missing hook 'formConfirm' in 'addreplace' $hooktype
2020-10-02 13:16:42 +02:00
Laurent Destailleur
ce0fa53cb0
Fix delete of file from file manager
2020-10-02 03:07:31 +02:00
Laurent Destailleur
ece8037f42
The button "Invoice orders" switch to page with lines autoselected.
2020-10-01 18:08:46 +02:00
Laurent Destailleur
7b3a7c9921
Add token on all url with action=delete
2020-10-01 10:50:54 +02:00
Laurent Destailleur
1e176fad8f
Fix GETPOST on array
2020-09-29 21:28:07 +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
Laurent Destailleur
8b2ba8cbba
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/bom/bom_card.php
htdocs/core/class/ldap.class.php
htdocs/core/lib/files.lib.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/admin.lang
2020-09-29 13:28:22 +02:00
Laurent Destailleur
43c167f0c8
Fix init var
2020-09-28 20:47:36 +02:00
Laurent Destailleur
8e59d0528e
Update html.formactions.class.php
2020-09-27 18:33:13 +02:00
Florian HENRY
f9d4a4d2ba
Merge branch 'develop' into fix_eventcreation
2020-09-27 17:58:05 +02:00
Laurent Destailleur
c659379307
Try a more complete fix than #14821
2020-09-27 17:21:49 +02:00
Laurent Destailleur
33d578a660
Fix bad management of default value in database on create form
2020-09-26 04:25:06 +02:00
Laurent Destailleur
88b4c1e766
Fix calculation of nb of top menu in CSS files.
2020-09-25 14:09:51 +02:00
Regis Houssin
d38c557fba
FIX Can create user but not update user with activedirectory
2020-09-25 12:11:13 +02:00
Laurent Destailleur
f066da1811
Minor security fixes
2020-09-24 16:19:24 +02:00
Laurent Destailleur
becf91904f
css
2020-09-24 08:55:33 +02:00
Laurent Destailleur
28d25f596b
Merge pull request #14671 from Tim-Otte/feature-add-incoterms-to-odt
...
NEW: Added incoterms to substitution array
2020-09-23 20:10:22 +02:00
Laurent Destailleur
09c6761dae
NEW Include the tag editor of page as a popup into website editor
2020-09-23 16:36:19 +02:00
Laurent Destailleur
6c06d2f0aa
Look and feel v13
2020-09-22 15:26:29 +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
e52559783f
Look and feel v13
2020-09-21 13:54:26 +02:00
Laurent Destailleur
3ca379c9e6
FIX Restore multiselect (selection of prospect level)
...
Conflicts:
htdocs/core/class/html.form.class.php
2020-09-21 12:22:57 +02:00
Laurent Destailleur
6380a294fc
FIX Restore multiselect (selection of prospect level)
2020-09-21 12:16:22 +02:00
Florian HENRY
0adca0a660
fix event creation same on all page
2020-09-21 11:43:08 +02:00
Tim Otte
05275a2b67
Added check if method exists
2020-09-21 08:50:39 +02:00
Laurent Destailleur
d5e6273b45
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-20 18:06:04 +02:00
Laurent Destailleur
acf28e28af
Label
2020-09-20 18:01:17 +02:00
Laurent Destailleur
ab94224d0c
Merge pull request #14668 from OPEN-DSI/email_smtp_allow_auto_signed
...
NEW : Email configuration - Allow auto signed certificat when smtp ssl activated
2020-09-20 17:56:23 +02:00
Laurent Destailleur
cd8ebd9500
Fix warnings
2020-09-20 16:57:53 +02:00
Laurent Destailleur
b3dd51b790
Fix warnings
2020-09-20 16:46:29 +02:00
Laurent Destailleur
667fb1098c
Fix
2020-09-20 16:06:53 +02:00
Laurent Destailleur
1a494542c6
Fix static
2020-09-20 14:40:49 +02:00
Laurent Destailleur
3f2220bd6f
Fix
2020-09-20 14:34:19 +02:00
Laurent Destailleur
216b3c885d
Fix escaping
2020-09-20 01:30:36 +02:00
Laurent Destailleur
54c0f742b1
Fix escape
2020-09-19 21:19:04 +02:00
Laurent Destailleur
99c05f0923
Fix rss
2020-09-19 00:51:09 +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
b6c6473cce
Fix sql injection when forging requests with IN
2020-09-18 17:47:40 +02:00
Laurent Destailleur
2d38644ae1
Sanitize sortfield
2020-09-18 17:13:01 +02:00
Laurent Destailleur
d75e1e5771
Fix #yogosha4525
2020-09-18 16:10:11 +02:00
Laurent Destailleur
c4b5f5a249
Maxi clean of code
2020-09-18 01:29:17 +02:00
Laurent Destailleur
4630887591
Fix css
2020-09-16 20:09:40 +02:00
Laurent Destailleur
d0c02f3714
FIX #yogosha4426
2020-09-16 14:51:46 +02:00
Laurent Destailleur
ffa91451eb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-16 02:50:36 +02:00
Laurent Destailleur
e5191cad24
Move code of incoterm into the Incoterm Trait.
2020-09-16 02:50:18 +02:00
Laurent Destailleur
2da4838141
Merge pull request #14730 from ptibogxiv/patch-358
...
NEW get state dictionnary by REST API
2020-09-16 01:12:08 +02:00
Laurent Destailleur
6dd1f522eb
CSS
2020-09-14 22:30:22 +02:00
Laurent Destailleur
f626bd70d0
Look and feel v13
2020-09-14 20:53:42 +02:00
stickler-ci
75a9678086
Fixing style errors.
2020-09-14 08:48:04 +00:00
ptibogxiv
e98ae029e3
Update cstate.class.php
2020-09-14 10:46:19 +02:00
kkhelifa-opendsi
1f5f784b75
Merge branch 'develop' into email_smtp_allow_auto_signed
2020-09-14 10:25:15 +02:00
kamel
2a5b31da2d
CORE smtps: Corrections
2020-09-14 10:22:05 +02:00
Scrutinizer Auto-Fixer
73915d51c8
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-14 02:30:04 +00: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
0d9d9498e2
Update commonobjectline.class.php
2020-09-14 00:13:12 +02:00
DEMAREST Maxime (Indelog)
1c523abbd8
Fix: getLabelOfUnit() for Product, CommonObjectline to print long label
...
Also add $type = 'code' for return unit code in form 'unitXX' (where XX
is the code of unit).
for get return like unitXX where XX is the code of unit
2020-09-13 07:44:30 +02:00
Cédric
acc995a553
Update commoninvoice.class.php
2020-09-12 19:05:33 +02:00
Laurent Destailleur
1f8278c8ca
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/core/class/html.formmail.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/langs/en_US/other.lang
htdocs/product/class/product.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-09-12 04:42:59 +02:00
Laurent Destailleur
5ea3f09e17
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/translate.class.php
2020-09-12 04:29:28 +02:00
Laurent Destailleur
709542e27d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-09-12 04:26:00 +02:00
Laurent Destailleur
990af9d5cf
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formmail.class.php
2020-09-12 04:25:54 +02:00
bahfir abbes
e89bfe5ac1
fix: unuseful truncations in extrafield select lists
2020-09-11 22:44:08 +01:00
Laurent Destailleur
009c7eaf31
Standardize code with module builder
2020-09-11 16:16:04 +02:00
Laurent Destailleur
8d93b76258
Clean code
2020-09-10 17:49:05 +02:00
John Botella
59d5391c2a
Add force reload param to load method
2020-09-10 10:41:16 +02:00
Laurent Destailleur
08ab4855f2
Merge branch 'develop' into 13a11
2020-09-09 19:12:08 +02:00
Laurent Destailleur
12fba9e679
Fix label
2020-09-09 15:19:12 +02:00
Laurent Destailleur
1c8e02df3b
Doc
2020-09-09 15:16:03 +02:00
Laurent Destailleur
230b6cdfd4
Add method isLoaded($domain)
2020-09-09 15:14:52 +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
John Botella
5a0622c906
FIX cron load lang
2020-09-08 16:14:14 +02:00
Tim Otte
c68928b8d0
Added incoterms to substitution array
2020-09-08 15:53:47 +02:00
lvessiller
23accef5c2
FIX empty value is needed on filter list
2020-09-08 14:53:40 +02:00
kamel
ed13a9fce2
Correction stickler-ci
2020-09-08 14:53:22 +02:00
kamel
ccff18e2a5
NEW : Email configuration - Allow auto signed certificat when ssl activated
2020-09-08 14:48:50 +02:00
Laurent Destailleur
54c0f673c1
Debug hidden option MAIN_USE_EXPENSE_IK
2020-09-08 12:00:14 +02:00
Laurent Destailleur
86ed4dfa2b
Debug hidden option MAIN_USE_EXPENSE_IK
2020-09-08 11:51:36 +02:00
Alexandre SPANGARO
9165ea9e67
Merge remote-tracking branch 'upstream/develop' into 13a11
2020-09-08 08:35:42 +02:00
Laurent Destailleur
fab24e8c55
Fix phpcs
2020-09-08 05:12:08 +02:00
Alexandre SPANGARO
d1ba6b9476
Merge remote-tracking branch 'upstream/develop' into 13a11
2020-09-08 05:01:36 +02:00
Alexandre SPANGARO
a050ee8385
Typo
2020-09-08 04:24:27 +02: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
lvessiller
5dee3b5b2f
FIX no empty value in required extrafield
2020-09-07 14:24:09 +02:00
Laurent Destailleur
b1e45aef46
Debug opensurvey. Look and feel v13. Removed deprecated properties.
2020-09-07 12:04:50 +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
d700649fb9
The deprecated subsitution key __SIGNATURE__ has been removed. Replace
...
with __USER_SIGNATURE__ if you still use old syntax in your email
templates.
2020-09-06 19:25:25 +02:00
Laurent Destailleur
84efd70dcb
FIX Clean tooltip of help for substition for long notes
2020-09-06 19:19:55 +02:00
bahfir abbes
77afbd4412
fix : unuseful truncation of list name elements
2020-09-04 15:58:21 +01:00
Laurent Destailleur
7094cec42a
Fix use same duration code 'on 1 letter' than the production duration
...
record, also than tha sprintf.
2020-09-04 14:37:55 +02:00
Juanjo Menent
9bd5ed627f
Fix travis issues
2020-09-04 09:55:02 +02:00
Juanjo Menent
bb92e64e43
FIX : #14474 Error when deleting
2020-09-03 12:43:38 +02:00
Laurent Destailleur
4da10b5f63
Merge pull request #14614 from aspangaro/13a10
...
New Accountancy Add predefined url in getNomUrl
2020-09-03 12:34:24 +02:00
atm-lena
197d03f9d9
FIX selectModelMail() : if default and no mail models select default model
2020-09-03 09:23:10 +02:00
Alexandre SPANGARO
b3cd9688d5
Typo
2020-09-02 23:43:47 +02:00
Laurent Destailleur
ed743c9dbb
Fix phpcs
...
More secured sendEmailsReminder()
2020-09-02 21:39:22 +02:00
Laurent Destailleur
9868140693
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-02 19:20:12 +02:00
Laurent Destailleur
4dca1929e0
Can close a recruitment job
2020-09-02 19:19:47 +02:00
Laurent Destailleur
6ccec31fa0
Merge pull request #14605 from Tim-Otte/fix-contact-type-translation
...
FIX: Contact type translation
2020-09-02 18:09:37 +02:00
Laurent Destailleur
6d52721246
Merge pull request #14609 from atm-lena/NEW_AddDefaultMailModelToSelect_EventReminder
...
Event Reminder : Add "Default Mail Model" to select Mail Model
2020-09-02 18:08:40 +02:00
Laurent Destailleur
de3e818ccf
Update html.form.class.php
2020-09-02 18:08:08 +02:00
lvessiller
27c754e6c8
NEW add send context for ticket
2020-09-02 15:33:18 +02:00
atm-lena
7b91c8efc8
Event Reminder : Add "Default Mail Model" to select Mail Model
2020-09-02 09:58:55 +02:00
Tim Otte
8a5a171cf8
Added agenda translation
2020-09-01 16:59:40 +02:00
Tim Otte
71471a054d
Loaded the required translations
2020-09-01 16:53:42 +02:00
Florian Mortgat
134a47a93f
FIX 10.0 - when the mime file name is different from the filesystem name, the attachment name should be the mime filename
2020-09-01 15:36:35 +02:00
atm-lena
d2ed43d913
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2
2020-09-01 09:43:14 +02:00
Laurent Destailleur
9dbc9582c1
Code comment
2020-08-31 17:12:31 +02:00
Laurent Destailleur
0a93954134
Fix regresssion. The reply_to was missing with SMTPS
2020-08-31 17:07:13 +02:00
Laurent Destailleur
49a4f4f1a1
More log
2020-08-31 17:00:43 +02:00
Laurent Destailleur
ffb3d810de
Complete fix for #14580 for v10 (backport of change of develop)
2020-08-31 16:21:59 +02:00
atm-lena
f8c79db4a9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2
2020-08-31 14:14:27 +02:00
Laurent Destailleur
8adf1852b1
Clean code
2020-08-30 03:00:35 +02:00
Laurent Destailleur
9cba23e458
Fix phpcs
2020-08-29 06:10:18 +02:00
Laurent Destailleur
bca9a84710
Enhance autofill of end date when creating an event
2020-08-29 06:05:52 +02:00
Laurent Destailleur
b721930b3b
Merge pull request #14568 from atm-lena/NEW_AgendaEvent_Remind
...
Agenda Remind (Part 1)
2020-08-29 05:19:21 +02:00
Laurent Destailleur
723a263cd3
Fix phpcs
2020-08-29 05:07:23 +02:00
Laurent Destailleur
bd201052de
Update html.form.class.php
2020-08-29 04:58:07 +02:00
Laurent Destailleur
ca47eb2c9f
Update html.form.class.php
2020-08-29 04:55:24 +02:00
Laurent Destailleur
0acb33fc91
Merge pull request #14582 from OPEN-DSI/new-ticket-remove-new-lines-in-mail
...
NEW remove new lines in mail on add ticket message
2020-08-28 21:08:17 +02:00
lvessiller
c3b095c820
NEW remove new lines in mail on add ticket message
2020-08-28 17:54:57 +02:00
Laurent Destailleur
50b791cfca
Fix css
2020-08-28 17:41:15 +02:00
Laurent Destailleur
9950f2ea83
Merge pull request #14581 from OPEN-DSI/new-ticket-add-subject-company-name
...
NEW subject title with company name instead of application title in t…
2020-08-28 17:36:38 +02:00
Laurent Destailleur
0b8d7f329e
FIX added information on user list not visible with multiselect
2020-08-28 17:17:22 +02:00
lvessiller
49098218cb
NEW subject title with company name instead of application title in ticket message
2020-08-28 16:55:28 +02:00
Laurent Destailleur
4ecd15b7ab
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/main.lang
2020-08-27 21:57:42 +02:00
Laurent Destailleur
1b77dc4e13
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-08-27 21:19:06 +02:00
Laurent Destailleur
fe4acf4e4e
NEW Add focus when editing on product/stock/product.php Close #14548
2020-08-27 21:18:40 +02:00
Laurent Destailleur
5c1680e9c5
Merge branch 'develop' into master
2020-08-27 19:58:29 +02:00
Laurent Destailleur
8a9244d1d6
Merge pull request #14567 from TobiasSekan/ShowRefInContractFormOnInterventions
...
NEW - Show references in contract form on interventions
2020-08-27 19:44:51 +02:00
Laurent Destailleur
6715eaee09
Update html.formcontract.class.php
2020-08-27 19:44:17 +02:00
atm-lena
acb50950a4
Add a default message to "actioncomm_send" template
2020-08-27 11:31:48 +02:00
stickler-ci
8ff24282d9
Fixing style errors.
2020-08-27 08:16:32 +00:00
Sekan, Tobias
c2590433fe
Show ref in contract form on interventions
2020-08-27 10:11:18 +02:00
atm-lena
c10556473f
Clean
2020-08-26 15:35:12 +02:00
atm-lena
1267e914dc
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind
2020-08-26 15:16:53 +02:00
atm-lena
d4e6a9871c
Update select_type_duration() function
2020-08-26 15:14:07 +02:00
atm-lena
a4018f41f7
WIP
2020-08-26 10:52:36 +02:00
Laurent Destailleur
23bb67873f
NEW Can edit the list of sending email profiles.
2020-08-25 19:40:17 +02:00
atm-lena
7df993c7ed
Add "select_model_mail" function + add select to create event
2020-08-25 17:26:32 +02:00
atm-lena
25840c2b3d
Create Event - Add fields
2020-08-25 12:40:29 +02:00
andreubisquerra
f9913be719
Change variable to pos_change
2020-08-23 22:24:46 +02:00
Laurent Destailleur
b600478a5a
Work on recruitment module
2020-08-23 22:11:16 +02:00
Laurent Destailleur
bd7261a449
Debug recruitment module
2020-08-23 18:04:52 +02:00
Laurent Destailleur
a4c34c2bc5
NEW Add Manufacturing Orders into the automatic ECM
2020-08-23 15:19:03 +02:00
Alexandre SPANGARO
bf28201685
Fix Missing language key
2020-08-23 07:13:43 +02:00
Laurent Destailleur
a265bec7ca
NEW Events in agenda for contact
...
FIX Saving contacts of an events
2020-08-23 02:38:56 +02:00
jove@bisquerra.com
d9cbd8f998
NEW: Print payment method and change in TakePOS
2020-08-22 18:28:15 +02:00
Laurent Destailleur
03af14294a
Standardize code. Debug module HRM
2020-08-22 15:29:19 +02:00
Laurent Destailleur
dabe804299
Add numbering modules for candidatures. Mass action Validate.
2020-08-22 03:49:46 +02:00
Laurent Destailleur
220fc6db98
Work on recruitment module
2020-08-21 13:00:12 +02:00
Laurent Destailleur
ad0625b6ec
Debug posting message from ticket page
2020-08-21 01:11:22 +02:00
Laurent Destailleur
66f9f37f41
Minor code and doc enhancement
2020-08-20 19:00:43 +02:00
Laurent Destailleur
7217dc3114
Better perf for phpunit on very large databases
2020-08-19 01:43:48 +02:00
Laurent Destailleur
964c4ef0d2
Standardize code. Use model_pdf.
2020-08-18 14:48:38 +02:00
Laurent Destailleur
e65e4a6d47
Beautify for of member module
2020-08-18 11:52:00 +02:00
Laurent Destailleur
24703b8fe7
Merge pull request #14487 from aspangaro/13a4
...
NEW Add a start date to begin binding in accountancy
2020-08-17 22:20:46 +02:00
Laurent Destailleur
bd65e5612f
Fix duplicate id
2020-08-17 20:06:01 +02:00
Laurent Destailleur
c63d54631c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/categories/class/categorie.class.php
2020-08-17 19:59:17 +02:00
Laurent Destailleur
487d26c7db
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
2020-08-17 19:54:23 +02:00
Laurent Destailleur
8bfa6df1a6
FIX Update extrafields on line only if it is supported
...
Conflicts:
htdocs/modulebuilder/template/class/myobject.class.php
2020-08-17 16:06:36 +02:00
Laurent Destailleur
8e00c9c304
FIX Update extrafields on line only if it is supported
2020-08-17 15:53:33 +02:00
Alexandre SPANGARO
498431fa6f
NEW Add a start date to begin binding in accountancy
2020-08-17 15:27:05 +02:00
Laurent Destailleur
99809b487e
Standardize code
2020-08-16 23:33:50 +02:00
Alexandre SPANGARO
27c36713d3
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-08-16 22:10:02 +02:00
lvessiller
d5acc85ef0
FIX param entity in html form file
2020-08-14 12:18:28 +02:00
Laurent Destailleur
0381cf5665
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/modules/modPaymentByBankTransfer.class.php
htdocs/filefunc.inc.php
2020-08-14 11:08:53 +02:00
Laurent Destailleur
056a503200
Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 12.0
...
Conflicts:
htdocs/product/composition/card.php
2020-08-14 11:06:39 +02:00
Laurent Destailleur
030df58fea
Fix regression in sending emails
2020-08-07 17:11:23 +02:00
Laurent Destailleur
795754273e
Fix regression in sending emails
2020-08-07 17:06:57 +02:00
Laurent Destailleur
bd5c4603e3
Fix regression in sending emails
2020-08-07 17:06:12 +02:00
Laurent Destailleur
00804c1020
Complete fix for #14146
2020-08-07 15:19:26 +02:00
Laurent Destailleur
6fd433167f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/CMailFile.class.php
2020-08-07 11:59:55 +02:00
Laurent Destailleur
284378232b
Merge pull request #14373 from atm-john/11.0_fix_bad_usage_of_moreparam
...
FIX : JS CRASH - bad usage of moreparam
2020-08-07 10:10:09 +02:00
florian HENRY
46cafcc445
Merge branch '11.0' into 12.0
2020-08-06 16:54:49 +02:00
florian HENRY
3e6ae9bebf
Merge branch '10.0' into 11.0
2020-08-06 16:34:45 +02:00
florian HENRY
53acd8cffd
FIX: MAIN_MAIL_FORCE_SENDTO work now for all mail sending method
2020-08-06 16:28:17 +02:00
Laurent Destailleur
1f02b33195
Work on inventory
2020-08-05 12:25:26 +02:00
John Botella
11f14b8fe5
Fix bad usage of moreparam
2020-08-04 14:13:52 +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
2076d18825
FIX Param of fetch_name_optionals_label must be object->table_element
2020-08-04 12:47:09 +02:00
Tim Otte
0e03578e91
Fixed translation of product units in documents
2020-08-04 11:51:40 +02:00
Laurent Destailleur
e455f8afa6
Merge pull request #14369 from Tim-Otte/fix-product-unit-translation
...
Fixed translation of product units in documents
2020-08-04 11:50:50 +02:00
Tim Otte
360afccecc
Fixed translation of product units in documents
2020-08-04 11:02:16 +02:00
VERDOL Gauthier
2d192431bc
FIX : wrong element var for fetch_name_optionals_label function with expeditions
2020-08-03 14:59:51 +02:00
Laurent Destailleur
fb811a1656
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/database-tables.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/commonobject.class.php
htdocs/langs/fr_FR/withdrawals.lang
htdocs/societe/class/societe.class.php
2020-08-03 14:44:01 +02:00
Laurent Destailleur
defbd26f95
Help to fight errors ErrorBadValueForParamNotAString
2020-08-03 12:33:22 +02:00
Laurent Destailleur
c2bb0431f0
FIX input field of extrafields must keep data if form submit fails.
2020-08-03 12:31:30 +02:00
Laurent Destailleur
d59bcd3f5b
FFIX error creating record when extrafields price exists in other entity
2020-08-03 12:08:33 +02:00
Laurent Destailleur
7297950308
Merge pull request #13759 from OPEN-DSI/stcommcontact
...
NEW: Add prospect status managment for the contact with managment of custom icon
2020-08-02 22:01:00 +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
ecfdb4bbac
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-08-02 16:02:09 +02:00
Laurent Destailleur
5e6254634f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-08-02 16:01:13 +02:00
Laurent Destailleur
1edfa4a4fb
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/html.form.class.php
2020-08-02 16:01:03 +02:00
Laurent Destailleur
8c4b4e233d
Merge pull request #14317 from fappels/12_show_virtual_stock
...
Fix hidden option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO
2020-08-02 01:32:18 +02:00
kkhelifa-opendsi
fe0f77b967
Merge branch 'develop' into stcommcontact
2020-07-31 16:41:17 +02:00
Laurent Destailleur
d4e21538db
FIX Debug setup of receipt printer module
2020-07-31 13:40:36 +02:00
altairis
9a9eef428b
fix duration fields size with firefox
2020-07-31 12:22:21 +02:00
Laurent Destailleur
0bf678e09e
Fix label of extrafields
2020-07-30 14:57:33 +02:00
Laurent Destailleur
8b879ee23b
FIX Edit extrafield of type long text loose carriage returns
2020-07-30 14:49:00 +02:00
Francis Appels
54410189bc
Fix hidden option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO
...
When product ajax search used a dash is show, so virtual stock looks like being negative value.
2020-07-29 17:00:39 +02:00
Laurent Destailleur
3d79950c27
Update commonobject.class.php
2020-07-29 14:13:29 +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
714481f7e5
FIX Navigation in object fails to find the next ref in some cases
2020-07-26 21:08:31 +02:00
Laurent Destailleur
a2dd80bcc8
FIX Navigation in object fails to find the next ref in some cases
2020-07-26 21:07:39 +02:00
Laurent Destailleur
b63a6bc72a
NEW Can use dynamic code into the 'enabled' property of DAO fields
2020-07-26 20:45:54 +02:00
Laurent Destailleur
f68be08c67
Merge pull request #14198 from Gecka-Apps/12.0-printStdColumnContent-hook-improve
...
Improve printStdColumnContent by passing the $pdf object
2020-07-24 13:20:03 +02:00
Laurent Destailleur
42234ba506
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/price.lib.php
2020-07-24 00:07:57 +02:00
quentin
255bd6b26c
FIX null required
2020-07-22 11:54:52 +02:00
Laurent Dinclaux
3cdabbaaff
Explicitly pass the pdf object by reference in the printStdColumnContent hook call.
2020-07-19 21:53:06 +11:00
Laurent Destailleur
cbc8187616
Merge pull request #14205 from Gecka-Apps/12.0-fix-extra-field-ordering
...
Fix extrafields ordering on PDFs
2020-07-18 19:30:34 +02:00
Laurent Destailleur
0d24b979c1
Fix phpcs
2020-07-11 01:20:20 +02:00
Laurent Destailleur
bb056fc811
Fix bad return value
2020-07-10 03:02:49 +02:00
Laurent Destailleur
f2c84fba3d
Merge pull request #14202 from pstructures/PSdevelop
...
Added Hook to showOptionals Function
2020-07-10 02:54:05 +02:00
Laurent Destailleur
96c583b84e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-10 02:28:34 +02:00
Laurent Destailleur
87913e8a5c
Fix prospect before customer
2020-07-10 02:11:23 +02:00
Laurent Destailleur
b8721e0c64
FIX Change position of line in BOM
2020-07-09 16:00:15 +02:00
Laurent Dinclaux
6ed2ae188e
Fix extrafields ordering on PDFs
2020-07-10 00:51:41 +11:00
Matt Sidnell
39104009ef
Updated to match inline with code received from fork
2020-07-08 14:25:37 +01:00
Matt Sidnell
580b9db3e7
Updated Hook in showOptionals function to allow the manipulation of optional fields on cards etc...
2020-07-08 14:20:59 +01:00
Laurent Dinclaux
37401df106
Improve printStdColumnContent by passing the $pdf object.
...
It isn't possible to replace the pdf edition done by this method without the $pdf object.
2020-07-08 14:48:34 +11:00
Laurent Destailleur
70c3146aba
Merge pull request #14106 from OPEN-DSI/new-extrafields-category-multi-select-with-link
...
NEW show links for select and multi-select in category extra field
2020-07-06 12:12:31 +02:00
Laurent Destailleur
eb7f3b81d3
Merge pull request #14187 from atm-john/10.0_fix_email_spoofing
...
Fix email spoofing - with hidden conf
2020-07-06 12:01:35 +02:00
Laurent Destailleur
42917000a3
Update CMailFile.class.php
2020-07-06 12:01:00 +02:00
Laurent Destailleur
2f04b4c559
Update CMailFile.class.php
2020-07-06 12:00:14 +02:00
stickler-ci
cb7b66d52c
Fixing style errors.
2020-07-06 09:19:27 +00:00
Alexandre SPANGARO
82c96a4f83
Fix SticklerCi
2020-07-06 04:47:27 +02:00
Alexandre SPANGARO
59ee22537d
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-07-06 03:24:27 +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
b726e96f4b
FIX Update form erased extrafields that were hidden
2020-07-04 17:09:20 +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
83eaddb17b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/evalmath.class.php
htdocs/core/class/extrafields.class.php
htdocs/install/mysql/migration/11.0.0-12.0.0.sql
htdocs/langs/en_US/cashdesk.lang
htdocs/societe/class/societe.class.php
2020-07-04 13:13:17 +02:00
Laurent Destailleur
94188af270
Merge pull request #14056 from atm-quentin/NEW_filter_on_event_tab
...
NEW multiselect type and date to date filter
2020-07-03 00:57:44 +02:00
Laurent Destailleur
03aa4873d1
Merge pull request #14141 from fappels/12_fix_extrafield_html
...
FIX html lost on html extrafield
2020-07-03 00:49:31 +02:00
Laurent Destailleur
fd617658ef
Fix syntax
2020-07-03 00:36:56 +02:00
Je2fb
b45bfd258d
fix #14143
2020-07-03 00:34:50 +02:00
Laurent Destailleur
a08e4bdf3f
Merge pull request #14163 from atm-quentin/FIX_line_reorder_rank_develop
...
NEW get all child recursively
2020-07-03 00:28:32 +02:00
Laurent Destailleur
a44f5376da
Update commonobject.class.php
2020-07-03 00:27:30 +02:00
Laurent Destailleur
bc1006e875
Merge pull request #14159 from Je2fb/develop
...
FIX #14143 DynamicPrice
2020-07-03 00:25:38 +02:00
Laurent Destailleur
6b16f64928
Fix properties used that does not exists
2020-07-02 03:39:47 +02:00
Laurent Destailleur
ca769a3c62
Fix scrutinizer errors
2020-07-02 03:37:01 +02:00
Laurent Destailleur
d3c23428d5
FIX Use of office365 TLS with SMTPs method.
...
Conflicts:
htdocs/core/class/smtps.class.php
2020-07-01 17:11:13 +02:00
Laurent Destailleur
324c8e9b54
FIX Use of office365 TLS with SMTPs method.
...
Conflicts:
htdocs/core/class/smtps.class.php
2020-07-01 17:10:33 +02:00
Laurent Destailleur
92a36dbeee
FIX Use of office365 TLS with SMTPs method.
2020-07-01 17:01:46 +02:00
Laurent Destailleur
226c907e35
FIX Use of office365 TLS with SMTPs method.
2020-07-01 17:00:52 +02:00
John Botella
2a9311b2d8
Fix email spoofing - with hidden conf
2020-07-01 16:55:23 +02:00
quentin
d2a364eea8
NEW get all child recursively
2020-07-01 14:10:43 +02:00
quentin
39651953b3
FIX refacto
2020-07-01 14:04:41 +02:00
quentin
267aa7605b
Merge remote-tracking branch 'dolibarr/develop' into NEW_filter_on_event_tab
2020-07-01 14:00:49 +02:00
Laurent Destailleur
b8ea58f18c
Fix phpcs
2020-06-30 16:15:10 +02:00
Laurent Destailleur
4baa00ba89
Fix phpcs
2020-06-30 13:20:46 +02:00
Laurent Destailleur
88cf904ced
Fix edit of tag of website
2020-06-30 02:50:58 +02:00
Laurent Destailleur
bb74804b74
NEW Add option TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT
2020-06-29 17:58:04 +02:00
Francis Appels
5d65b5f660
fix html should not do price2num
2020-06-29 09:07:54 +02:00
Laurent Destailleur
ab88890f3a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-28 21:48:28 +02:00
Laurent Destailleur
b725aca8aa
Merge branch 'develop' into 11.0_bug
2020-06-28 21:19:11 +02:00
Laurent Destailleur
a3ae7a76b8
WIP Stock at date
2020-06-28 19:35:24 +02:00
Je2fb
245ba93895
fix #14143
2020-06-28 17:53:48 +02:00
Francis Appels
731978fda6
FIX html lost on html extrafield
2020-06-28 16:33:44 +02:00
Laurent Destailleur
194b92e70f
Fix load of menu when 'perm' or 'enabled' is '0'.
2020-06-27 15:27:09 +02:00
Laurent Destailleur
4d01030fd9
Fix phpcs
2020-06-27 02:00:42 +02:00
Laurent Destailleur
ec5cfee150
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-27 01:57:18 +02:00
Laurent Destailleur
443558e3a2
Fix phpcs
2020-06-27 01:57:01 +02:00
Laurent Destailleur
90d4458aab
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2020-06-27 00:38:51 +02:00
Laurent Destailleur
3655f6f407
FIX #14109
2020-06-26 20:38:41 +02:00
Laurent Destailleur
6df049e05c
FIX #14112
2020-06-26 20:35:06 +02:00
Laurent Destailleur
d6346522b8
Code comment
2020-06-26 19:36:15 +02:00
Laurent Destailleur
b0d46d0c4c
Code comment
2020-06-26 18:56:05 +02:00
Laurent Destailleur
29ba9c82c3
Fix #14120
2020-06-26 17:17:13 +02:00
gauthier
858a751eef
FIX : $_POST must be GETPOST
2020-06-26 10:51:04 +02:00
Laurent Destailleur
e2b1b853c0
Minor performance enhancements
2020-06-26 01:44:21 +02:00
Laurent Destailleur
333d4873c3
Properties ->contactid has been renamed into ->contact_id
2020-06-25 12:17:47 +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
02e022ebfa
Fix class not found for supplier credit. Class must be into
...
commoninvoice
2020-06-24 19:59:06 +02:00
Laurent Destailleur
de62037ba5
Fix signed only in margin calculation of project
2020-06-24 12:58:10 +02:00
Laurent Destailleur
6d25b8630b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/prelevement.php
htdocs/core/class/rssparser.class.php
2020-06-23 11:38:20 +02:00
Regis Houssin
32844a8d0c
FIX clean code
2020-06-22 09:26:42 +02:00
lvessiller
bf338b4d4f
NEW show links for select and multi-select in category extra field
2020-06-22 08:57:52 +02:00
Laurent Destailleur
1ce5b78a6b
Fix error message not reported
2020-06-22 01:02:17 +02:00
Regis Houssin
9a4f5e3d9a
FIX We force "modify" for avoid some field not modify
2020-06-21 21:10:51 +02:00
Laurent Destailleur
501fd2f7a3
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/takepos/admin/receipt.php
2020-06-21 20:48:41 +02:00
Regis Houssin
03fbd72d66
FIX For better compatibility with Samba4 AD
2020-06-21 19:52:15 +02:00
Laurent Destailleur
ccc55dcb1e
Debug Receipt printer module and reduce duplicate translation key
2020-06-20 15:19:19 +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
Laurent Destailleur
2de3eb8ac0
Fix CSS
2020-06-20 00:00:17 +02:00
Laurent Destailleur
4627f06c70
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-16 22:57:50 +02:00
Laurent Destailleur
9ec8051a37
NEW Add param to not show links when output tags
2020-06-16 02:56:48 +02:00
Laurent Destailleur
b7d835eceb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-15 16:10:27 +02:00
Laurent Destailleur
1ba03566dc
Fix case of delete contact not correctly implemented.
2020-06-12 02:15:02 +02:00
Laurent Destailleur
012574b487
Update html.form.class.php
2020-06-12 00:51:19 +02:00
Laurent Destailleur
d7cbd8a1d4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-11 23:41:43 +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
e087edf005
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formticket.class.php
htdocs/ticket/class/ticket.class.php
2020-06-11 23:39:26 +02:00
Laurent Destailleur
e04557948d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-06-11 23:37:04 +02:00
Laurent Destailleur
2109a91992
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/html.formticket.class.php
htdocs/takepos/admin/setup.php
2020-06-11 23:36:55 +02:00
Laurent Destailleur
073a4acd10
Merge pull request #14058 from indelog/showmailpj
...
NEW Add show preview for mail attachement on form mail
2020-06-11 23:09:26 +02:00
Laurent Destailleur
b36e658b20
Update html.formticket.class.php
2020-06-11 22:58:58 +02:00
Laurent Destailleur
ee611fa7a0
Fix bad definition of field for parent
2020-06-11 18:32:05 +02:00
Laurent Destailleur
c289001507
Fix bad definition of field for parent
2020-06-11 18:31:26 +02:00
gauthier
58ff96af30
FIX : $arraydefaultmessage is an object, as well as in /htdocs/core/class/html.formmail.class.php
2020-06-10 16:48:02 +02:00
DEMAREST Maxime (Indelog)
1ac341e651
Fix undef func measuringUnitString() in From::select_produits_fournisseurs_list
2020-06-09 15:33:10 +02:00
DEMAREST Maxime (Indelog)
e628730a3f
Add show preview for mail attachement on form mail
2020-06-09 11:35:46 +02:00
Laurent Destailleur
ff9312c96a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/class/ligneprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/line.php
2020-06-08 20:36:54 +02:00
atm-quentin
3dd7c81f54
FIX stickler
2020-06-08 15:58:20 +02:00
Laurent Destailleur
f4f0da6de2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-08 15:42:27 +02:00
Laurent Destailleur
366f458b39
Show more info to help fix corrupted data
2020-06-08 15:20:01 +02:00
Laurent Destailleur
fd8f8ff4e1
Error message
2020-06-08 15:12:07 +02:00
atm-quentin
69db790cf5
NEW multiselect type and date to date filter
2020-06-08 14:43:14 +02:00
Laurent Destailleur
6f12488e30
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
2020-06-07 19:55:48 +02:00
Laurent Destailleur
09047dc19c
Doc
2020-06-07 19:26:37 +02:00
Laurent Destailleur
81c80b254e
Fix lang property on database menu entry was not propagated
2020-06-07 19:25:25 +02:00
Laurent Destailleur
7d3039d41f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/user/card.php
2020-06-06 23:04:55 +02:00
Laurent Destailleur
19405d5f5b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/langs/en_US/admin.lang
2020-06-06 23:02:05 +02:00
Laurent Destailleur
cbafbe16a2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/supplier/index.php
htdocs/admin/mails_templates.php
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formticket.class.php
htdocs/langs/en_US/admin.lang
2020-06-06 23:00:24 +02:00
Laurent Destailleur
b221c65165
Merge
2020-06-06 21:56:23 +02:00
Laurent Destailleur
b386400365
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-06 21:52:55 +02:00
Laurent Destailleur
261d0772f8
Update commonobject.class.php
2020-06-06 21:47:27 +02:00
Laurent Destailleur
bb192195f1
Update commonobject.class.php
2020-06-06 21:41:33 +02:00
Laurent Destailleur
87806346c7
Update commonobject.class.php
2020-06-06 21:40:20 +02:00
Laurent Destailleur
d9ac7ab9da
Update commonobject.class.php
2020-06-06 21:37:53 +02:00
Laurent Destailleur
a66926cf08
Update commonobject.class.php
2020-06-06 21:30:08 +02:00
Laurent Destailleur
4f2af3bf67
Merge pull request #14021 from atm-gauthier/10.0_fix_modelmail_tickets
...
FIX : Tickets mail models doesn't work
2020-06-06 21:24:04 +02:00
Laurent Destailleur
30c6ae394b
Update html.formticket.class.php
2020-06-06 21:23:35 +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
florian HENRY
699557adbe
forget[]
2020-06-04 21:39:23 +02:00
florian HENRY
afafe1a737
forget[]
2020-06-04 21:38:44 +02:00
florian HENRY
29649a1e2a
Merge branch '11.0' of github.com:atm-florian/dolibarr into 11.0
2020-06-04 20:21:17 +02:00
stickler-ci
e9b17aac8d
Fixing style errors.
2020-06-04 18:20:48 +00:00
florian HENRY
b47761e05c
fix comment
2020-06-04 20:20:43 +02:00
florian HENRY
7115bd7033
better fix
2020-06-04 20:14:19 +02:00
Alexandre SPANGARO
ede084a111
Fix stickler
2020-06-04 05:11:00 +02:00
Alexandre SPANGARO
9e5c7d0acf
FIX: Show ref_customer, amount on contract link object
2020-06-03 23:00:53 +02:00
Laurent Destailleur
8023bc2fbb
Fix cancel in media filemanager
2020-06-03 12:39:06 +02:00
Laurent Destailleur
ae3d786593
Fix crop on media file manager
...
Conflicts:
htdocs/core/ajax/ajaxdirpreview.php
htdocs/core/photos_resize.php
htdocs/theme/eldy/global.inc.php
2020-06-03 12:38:42 +02:00
Laurent Destailleur
93320deddc
Fix cancel in media filemanager
2020-06-03 12:34:09 +02:00
Laurent Destailleur
8894570054
Fix crop on media file manager
2020-06-03 11:20:59 +02:00
Laurent Destailleur
a37a4031e9
FIX Delete of website page need permission. Conflict with mass action.
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/index.php
2020-06-03 01:02:19 +02:00
Laurent Destailleur
d4db1836d1
FIX Delete of website page need permission. Conflict with mass action.
2020-06-03 00:46:09 +02:00
gauthier
68bb552dcc
FIX : Tickets mail models doesn't work
2020-06-02 17:06:49 +02:00
Laurent Destailleur
658e7a2f87
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-02 13:32:09 +02:00
Laurent Destailleur
9a30d4ca44
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-02 13:32:02 +02:00
Laurent Destailleur
6ddabd51c0
Update commonobject.class.php
2020-06-01 21:03:42 +02:00
bahfir abbes
f2c7db63cf
fix:le résultat de explode est troujours un array
2020-06-01 21:02:45 +02:00
Laurent Destailleur
14a3ab68e6
Merge pull request #14008 from bafbes/abb110217
...
fix:the result of explode is always an array
2020-06-01 21:02:15 +02:00
Laurent Destailleur
d3a769a0ab
Update commonobject.class.php
2020-06-01 21:02:05 +02:00
Laurent Destailleur
0f5eed60a2
Update commonobject.class.php
2020-06-01 20:41:12 +02:00
bahfir abbes
2984edc752
fix:bad database quotation for booleans
2020-06-01 20:40:51 +02:00
Laurent Destailleur
9bf69f11c4
Merge pull request #14010 from bafbes/abb110220
...
fix:bad database quotation for booleans
2020-06-01 20:39:58 +02:00
Laurent Destailleur
2dac87621a
Update commonobject.class.php
2020-06-01 20:39:49 +02:00
Laurent Destailleur
69c3b4b4ea
Merge pull request #14015 from ptibogxiv/patch-342
...
FIX php error
2020-06-01 20:17:22 +02:00
Laurent Destailleur
b20e8b9d6b
Merge pull request #14013 from bafbes/abb110222
...
fix:this is required to navigate by id
2020-06-01 20:15:48 +02:00
Laurent Destailleur
0362d28cf7
Update commonobject.class.php
2020-06-01 20:13:27 +02:00
Laurent Destailleur
2324834b73
Debug modulebuilder for doc generation
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/modulebuilder/template/admin/setup.php
2020-06-01 16:47:50 +02:00
Laurent Destailleur
58e76947ac
Debug modulebuilder for doc generation
2020-06-01 16:44:22 +02:00
florian HENRY
2337d75d92
better fix for #13968
2020-06-01 10:43:57 +02:00
Laurent Destailleur
4af17a342c
Doc
2020-06-01 00:00:24 +02:00
Laurent Destailleur
c04903d15c
Fix debug modulebuilder for doc and ref generation
...
Conflicts:
htdocs/core/class/commonobject.class.php
2020-05-31 23:01:13 +02:00
Laurent Destailleur
e2bb04dcae
Fix debug modulebuilder for doc and ref generation
2020-05-31 22:59:33 +02:00
ptibogxiv
a33f503a0d
FIX php error
...
Fatal error: Uncaught Error: Call to undefined function getCountry() in /volume2/web/dolibarr/htdocs/core/class/html.form.class.php on line 2583 Error: Call to undefined function getCountry() in /volume2/web/dolibarr/htdocs/core/class/html.form.class.php on line 2583 Call Stack: 0.0001 409544 1. {main}() /volume2/web/dolibarr/htdocs/adherents/admin/adherent.php:0 0.1935 3017200 2. Form->select_produits() /volume2/web/dolibarr/htdocs/adherents/admin/adherent.php:215 0.1935 3017200 3. Form->select_produits_list() /volume2/web/dolibarr/htdocs/core/class/html.form.class.php:2134 0.1983 3439880 4. Form->constructProductListOption() /volume2/web/dolibarr/htdocs/core/class/html.form.class.php:2451
2020-05-31 14:28:41 +02:00
bahfir abbes
f76c025a7b
fix:this is required to navigate by id
2020-05-31 02:01:33 +01:00
bahfir abbes
e5a51eb732
fix:bad database quotation for booleans
2020-05-31 01:41:04 +01:00
bahfir abbes
d6247bfc97
fix:le résultat de explode est troujours un array
2020-05-31 01:23:35 +01:00
Laurent Destailleur
82455681d6
Merge pull request #13582 from TobiasSekan/UseCatApiForProjectList
...
NEW Use new category API for project list view
2020-05-30 17:22:43 +02:00
Laurent Destailleur
7fc6917cfd
Debug feature of alternate languages
2020-05-29 22:01:02 +02:00
Laurent Destailleur
b3118d0189
Debug feature of alternate languages
2020-05-29 21:59:33 +02:00
Laurent Destailleur
c2a9819daa
Debug establishment management
2020-05-29 21:45:50 +02:00
Laurent Destailleur
b11ef125c3
FIX Force of HTML content only for ckeditor
...
Conflicts:
htdocs/modulebuilder/index.php
2020-05-29 03:27:30 +02:00
Laurent Destailleur
a0a440cf5f
FIX Force of HTML content only for ckeditor
2020-05-29 03:26:05 +02:00
Laurent Destailleur
2836368017
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/filefunc.inc.php
htdocs/takepos/css/phone.css
htdocs/takepos/invoice.php
2020-05-28 20:20:39 +02:00
Laurent Destailleur
3606ed2bda
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/adherents/class/adherent.class.php
2020-05-28 20:17:26 +02:00
Laurent Destailleur
1992b633ba
Fix phpcs
2020-05-28 20:02:07 +02:00
stickler-ci
56259bae9a
Fixing style errors.
2020-05-28 14:18:00 +00:00
glu000
9915d97adf
Fix #13991
2020-05-28 16:11:02 +02: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
f66555b396
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-27 23:38:46 +02:00
Laurent Destailleur
689289acd0
Doc
2020-05-27 23:20:26 +02:00
Laurent Destailleur
a2a15ceb5b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/demandes.php
htdocs/core/class/html.form.class.php
2020-05-27 23:07:18 +02:00
Laurent Destailleur
ceda05a879
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-05-27 14:39:38 +02:00
Laurent Destailleur
e2680fa29a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/html.form.class.php
2020-05-27 14:39:19 +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
Laurent Destailleur
0b48ffe3cd
Removed not used var $useglobalvars
2020-05-27 11:38:28 +02:00
Laurent Destailleur
00484d5938
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-26 23:23:31 +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
da8bd7507e
NEW Add mass action to set category on a list of website pages.
2020-05-26 22:29:46 +02:00
Laurent Destailleur
3aaefd15b0
Fix set of categories
2020-05-26 01:07:43 +02:00
Laurent Destailleur
5f90596bb7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-26 00:20:36 +02:00
Laurent Destailleur
ab176cd078
Merge pull request #13937 from frederic34/Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
...
add new rule
2020-05-26 00:20:12 +02:00
Laurent Destailleur
f9f5beb064
NEW Can set tags/categories to website pages.
2020-05-26 00:19:32 +02:00
Laurent Destailleur
80ace3b52c
Revert due to regressions
2020-05-25 23:05:29 +02:00
Laurent Destailleur
a80270ebb5
Revert "clean"
...
This reverts commit 7e7a10f8d2
2020-05-25 23:01:25 +02:00
Laurent Destailleur
faf7a379ba
Revert "clean"
...
This reverts commit 8f9ee3250d
2020-05-25 23:01:20 +02:00
Laurent Destailleur
26eab1f285
Merge pull request #13782 from frederic34/free_email
...
NEW enable free emails input with select2
2020-05-25 22:55:36 +02:00
Laurent Destailleur
40816c02ce
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-25 22:40:59 +02:00
Laurent Destailleur
17382051c2
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-25 22:19:50 +02:00
Laurent Destailleur
e4ef6334aa
Look and feel v12
2020-05-25 14:08:36 +02:00
Laurent Destailleur
0b9e1e6ec6
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-25 13:01:49 +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
47465f4108
Fix for situation invoice (exclude credit not when searching last
...
invoice to use)
2020-05-25 00:20:00 +02:00
Laurent Destailleur
aee6fce9f8
Fix remove bad use
2020-05-24 20:04:26 +02:00
Frédéric FRANCE
a7e0fe24ff
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-23 21:44:14 +02:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-23 18:34:58 +02:00
Laurent Destailleur
acaab1fd45
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-23 13:49:15 +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
Frédéric FRANCE
3a786ca766
add new rule
2020-05-21 15:25:42 +02:00
stickler-ci
459154edc0
Fixing style errors.
2020-05-21 13:11:06 +00:00
Frédéric FRANCE
b41ac00b98
add new rule
2020-05-21 15:05:19 +02:00
Frédéric FRANCE
b58060f899
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-21 13:29:43 +02:00
Laurent Destailleur
8a481b297c
Clean CSS, clean code
2020-05-21 13:06:36 +02:00
Frédéric FRANCE
def53338de
add new rule
2020-05-21 09:07:10 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule
2020-05-21 01:41:27 +02:00
Laurent Destailleur
15f3c97fff
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-20 23:59:11 +02:00
Laurent Destailleur
036617570e
Doc
2020-05-20 23:46:48 +02:00
Frédéric FRANCE
76bb57bc6b
enhance free email
2020-05-15 18:50:37 +02:00
Frédéric FRANCE
1bc8765291
enhance free email
2020-05-15 18:42:41 +02:00
Frédéric FRANCE
b9a082f774
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-15 18:08:51 +02:00
Frédéric FRANCE
e583dc0a7f
enhance free email
2020-05-15 18:07:17 +02:00
Laurent Destailleur
73cc50e1bf
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-15 17:19:57 +02:00
Laurent Destailleur
70fc74008a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
2020-05-15 17:19:43 +02:00
Laurent Destailleur
86ff60f161
Fix break line and set of opportunity fields
2020-05-15 15:50:50 +02:00
Laurent Destailleur
0091a48f42
Merge pull request #13787 from simicar29/dev-multiplemassaction
...
Enable multiple mass actions on a single page - dev branch
2020-05-15 14:37:33 +02:00
Laurent Destailleur
5933aba38c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-15 14:12:04 +02:00
Laurent Destailleur
0f403ba9ea
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-15 14:11:13 +02:00
Scrutinizer Auto-Fixer
9699ee7263
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-15 11:55:31 +00:00
Laurent Destailleur
02b40ae8f6
Fix scrutinizer
2020-05-15 13:54:05 +02:00
Frédéric FRANCE
9afe335e4e
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-14 18:45:52 +02:00
Laurent Destailleur
1bf677f537
Can set status of a websitepage
2020-05-14 18:14:55 +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
Frédéric FRANCE
7e5a07a863
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-12 07:57:32 +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
Frédéric FRANCE
3e5489f7f6
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-11 18:17:27 +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
Frédéric FRANCE
bd7a2d23a0
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-08 21:29:12 +02:00
Frédéric FRANCE
8f9ee3250d
clean
2020-05-07 23:28:32 +02:00
Frédéric FRANCE
7e7a10f8d2
clean
2020-05-07 22:55:21 +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
Frédéric FRANCE
6d5e83ad66
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-07 16:16:10 +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
Frédéric FRANCE
574a4d4ce8
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-06 10:54:59 +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
Frédéric FRANCE
93cac43306
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-05 18:37:56 +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
Frédéric FRANCE
44f914fede
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-02 13:29:56 +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
Frédéric FRANCE
39ac031aa9
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-02 06:59:54 +02:00
Marc Guenneugues
fbabfe9a71
Correct typo
2020-05-02 06:53:11 +02:00
Marc Guenneugues
79647b35cd
Enable multiple mass actions on a single page - dev branch
2020-05-02 06:42:12 +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
3c7265e357
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-01 17:12:17 +02:00
Frédéric FRANCE
92898c9562
enable free emails with select2
2020-05-01 11:27:11 +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
kkhelifa-opendsi
908c653743
Merge branch 'develop' into stcommcontact
2020-04-28 09:03:17 +02:00
Laurent Destailleur
0de8cb7096
Add property shortlang
2020-04-27 18:38:11 +02:00
kamel
218fbfc70b
Correction pour validation Stickler CI / stickler-ci
2020-04-27 18:06:50 +02:00
kamel
28d330996c
Correction pour validation Stickler CI / stickler-ci
2020-04-27 18:01:07 +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
kamel
9cb90cb384
NEW: Add prospect status managment for the contact with managment of custom icon
2020-04-27 17:35:14 +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
Sekan, Tobias
ab870dd532
Switch to new category API in project list view
2020-04-12 13:30:02 +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
jove@bisquerra.com
ea79c91482
Add langs and print only no printed order lines
2020-04-08 20:02:54 +02:00
stickler-ci
e402e35d96
Fixing style errors.
2020-04-08 14:09:04 +00:00
simicar29
6cb780d125
Avoid the doubledot issue in quoted-printable mail
...
When sending HTML mail using swiftmailer, the content will be encoded using quoted-printable. We may then encounter the "double dot" issue (doubled dot at the beginning of the line). This can be problematic with broken links to pictures for example.
This PR switches the encoding to base64.
2020-04-08 16:03:41 +02:00
Laurent Destailleur
3a024124e8
Merge pull request #13525 from TobiasSekan/ConfirmDeleteOnFactureCard
...
NEW Confirm file delete on fracture card
2020-04-08 14:53:19 +02:00
Laurent Destailleur
711f54846b
Merge pull request #13514 from andreubisquerra/develop
...
NEW RECEIPT_PRINTER_NB_CHARACT_BY_LINE and FIX product label
2020-04-08 14:49:16 +02:00
Tobias Sekan
91483fd560
Add optional remove action for showDocuments
2020-04-08 10:24:32 +02:00
Norbert Penel
a5f39e996d
FIX : twice call in a page
...
fix to let this function be used twice in a page
2020-04-07 09:27:55 +02:00
andreubisquerra
5707bf0d73
NEW RECEIPT_PRINTER_NB_CHARACT_BY_LINE and FIX product label
2020-04-06 19:38:50 +02:00
Laurent Destailleur
41b2ed8f89
Look and feel v12
2020-04-06 12:03:37 +02:00
Laurent Destailleur
81f289619d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-05 15:47:46 +02:00
Laurent Destailleur
ed4aa55857
Doxygen
2020-04-05 15:46:10 +02:00
Laurent Destailleur
233a7f1022
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-05 12:24:27 +02:00
Laurent Destailleur
bfbc9b303a
Fix phpcs
2020-04-05 12:23:16 +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
Laurent Destailleur
a41f54c82f
Fix css
2020-04-05 02:39:40 +02:00
Laurent Destailleur
647d09050b
Clean not required vars
2020-04-04 19:25:36 +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
87d46c4e86
Merge pull request #13473 from nervo/patch-1
...
NEW [Allow constants values to be overridden by environment variables]
2020-04-02 13:33:47 +02:00
Laurent Destailleur
9f55918cb8
Remove Geoipv1 library. We use now v2
2020-04-02 12:37:21 +02:00
Laurent Destailleur
84cda962c1
Clean dead code
2020-04-02 12:03:29 +02:00
Laurent Destailleur
f6b216eafc
Fix travis
2020-04-01 23:32:44 +02:00
Laurent Destailleur
6aea67a5b9
Work on extralanguages
2020-04-01 23:15:53 +02:00
stickler-ci
cf3615aee3
Fixing style errors.
2020-04-01 20:11:18 +00:00
nervo
abd6465190
Allow constants values to be overridden by environment variables
2020-04-01 22:02:34 +02:00
Laurent Destailleur
d2de6a22eb
WIP Can set values in extra languages
2020-04-01 18:11:28 +02:00
Laurent Destailleur
33d2b61c19
Work on extralanguages
2020-04-01 16:21:03 +02:00
Laurent Destailleur
e75e49426f
Look and feel v12
2020-03-31 13:52:02 +02:00
Laurent Destailleur
0b7b97ec34
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-30 19:43:03 +02:00
Laurent Destailleur
efaea37d61
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2020-03-30 19:42:53 +02:00
Laurent Destailleur
4220236aa8
Merge pull request #13425 from andreubisquerra/develop
...
NEW: CUPS printing compatibility for TakePOS
2020-03-30 18:56:14 +02:00
oscim
d760b6618d
Fix use correctly hosts in connection
...
cf https://github.com/Dolibarr/dolibarr/issues/9426
2020-03-30 18:27:18 +02:00
Nicolas Bouquet
31fca2897a
FIX: extra date field incorrect check
...
Small typo fixed, was preventing extra date fields from being processed, leading to denial of object creation
2020-03-30 10:24:42 +02:00
Laurent Destailleur
4ed4644c08
Work on generic multilanguage properties
2020-03-29 04:28:23 +02:00
Laurent Destailleur
d5b107211f
Look and feel v12
2020-03-28 15:20:26 +01:00
Laurent Destailleur
ec83f18944
Move more icon definition into CSS
2020-03-28 13:38:25 +01:00
Laurent Destailleur
c27592bad2
Clean deprecated params on all fetch_optionals()
2020-03-27 16:02:58 +01:00
Laurent Destailleur
9379f6fa9d
Fix duplicate tooltip
2020-03-26 20:27:49 +01:00
Laurent Destailleur
a02e3e1e61
Fix duplicate tooltip
2020-03-26 20:05:17 +01:00
Laurent Destailleur
4a012c13b2
FIX Translation of tooltips of extrafields
2020-03-26 19:47:28 +01:00
Laurent Destailleur
2f94db6ffe
FIX Translation of tooltips of extrafields
2020-03-26 19:46:36 +01:00
Laurent Destailleur
5a5863f46a
FIX Group by invalid with pgsql
2020-03-26 03:55:34 +01:00
Laurent Destailleur
fa3bba942f
Start to save the VAT src code into table of discounts to reuse them
...
later
2020-03-26 02:01:30 +01:00
Laurent Destailleur
ab19bb2455
FIX default value of selectMasssAction broken
2020-03-26 01:25:05 +01:00
Laurent Destailleur
90e0ead953
FIX default value of selectMasssAction broken
2020-03-26 00:52:05 +01:00
Laurent Destailleur
20fad86520
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/cashcontrol/cashcontrol_card.php
2020-03-26 00:14:06 +01:00
andreubisquerra
eef3a1795e
Update dolreceiptprinter.class.php with CUPS
2020-03-25 21:30:33 +01:00
Laurent Destailleur
51f8c5ca87
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/commoninvoice.class.php
htdocs/expensereport/list.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/product/fournisseurs.php
2020-03-25 19:01:56 +01:00
Laurent Destailleur
7c819a96d5
Merge pull request #13415 from ptibogxiv/patch-314
...
NEW PRODUCT_SHOW_ORIGIN_IN_COMBO
2020-03-25 18:32:57 +01:00
Laurent Destailleur
0a92dcc5e6
Merge pull request #13413 from atm-florian/develop
...
fix extrafield creation with empty printable
2020-03-25 18:31:28 +01:00
Laurent Destailleur
925554d15e
More accurate result
2020-03-25 18:27:53 +01:00
Laurent Destailleur
3855ef6073
Add rounding code 'CR' (currency rate'
2020-03-25 17:41:39 +01:00
VESSILLER
c516a54f78
FIX get remain to pay with rounding decimals
2020-03-25 11:53:47 +01:00
ptibogxiv
06f53fdd69
Update html.form.class.php
2020-03-24 17:32:50 +01:00
ptibogxiv
8409f3ba4e
NEW PRODUCT_SHOW_ORIGIN_IN_COMBO
...
for some business, products have same label so we sometimes need display origin of product for a good choice
2020-03-24 17:28:12 +01:00
florian HENRY
21febcc8fc
fix extrafeild creation
2020-03-24 16:09:18 +01:00
Scrutinizer Auto-Fixer
e8083e2a65
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-23 14:54:02 +00:00
Laurent Destailleur
94b6fbb223
FIX #13300
2020-03-22 20:52:00 +01:00
Laurent Destailleur
26e9500c26
FIX #13300
2020-03-22 20:50:50 +01:00
Laurent Destailleur
6f3cbe69e8
Fix phpcs
2020-03-22 19:40:58 +01:00
Laurent Destailleur
700e384639
WIP Edit fields into alternate language
2020-03-22 19:11:21 +01:00
Laurent Destailleur
0574e1df9f
Merge pull request #13386 from aspangaro/12.0_a24
...
FIX: Load the translation file for extrafields
2020-03-20 10:05:41 +01:00
Laurent Destailleur
5ffc57f3f0
Update extrafields.class.php
2020-03-20 10:05:08 +01:00
Laurent Destailleur
03b261d54c
Provide information of thirdparty, contact or project to SMS handler
2020-03-19 19:11:34 +01:00
Alexandre SPANGARO
a6227aeb6a
FIX: Load the translation file for extrafields
2020-03-19 11:53:42 +01:00
Laurent Destailleur
fca6d45baa
NEW Overwrite tpl with module_part['tpl'] is deprecated. USe hooks
...
instead.
2020-03-19 10:15:34 +01:00
Laurent Destailleur
c94c33696a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-19 09:58:04 +01:00
Laurent Destailleur
d38c6616e6
Doc
2020-03-19 09:53:20 +01:00
Laurent Destailleur
21de447d9e
Merge pull request #13349 from TobiasSekan/AddSubstitutForUserCivility
...
NEW "contact_civility" for ODT templates
2020-03-18 19:31:10 +01:00
Laurent Destailleur
2c3bd78095
Merge pull request #13353 from FHenry/dev_addHookOnSelectUserORSalesRep
...
new : Add hook on select user or sales rep
2020-03-18 18:56:56 +01:00
Laurent Destailleur
3b1c02ae46
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-18 18:51:05 +01:00
Laurent Destailleur
8bab245c7e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/tpl/contacts.tpl.php
2020-03-18 18:50:55 +01:00
Laurent Destailleur
e639e24993
Merge pull request #13352 from aspangaro/12.0_a22
...
FIX Update fiscalyear.class.php to filter on entity
2020-03-18 18:19:02 +01:00
Laurent Destailleur
94750ed350
css
2020-03-17 01:31:48 +01:00
Alexandre SPANGARO
6b168428d8
Merge remote-tracking branch 'upstream/develop' into 12.0_a22
2020-03-16 12:11:01 +01:00
florian HENRY
ef83801a53
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_addHookOnSelectUserORSalesRep
2020-03-16 11:53:49 +01:00
florian HENRY
117ff5f4eb
add hook to add sql filter in where clause on select users
2020-03-16 11:49:03 +01:00
Alexandre SPANGARO
301b97f6d2
FIX Update fiscalyear.class.php to filter on entity
2020-03-16 10:05:22 +01:00
Tobias Sekan
c50f2b32d8
Add substitution for "user_civility" for ODT
2020-03-16 07:58:44 +01:00
Laurent Destailleur
22e8fdb46b
Enhance #13033
2020-03-15 13:57:31 +01:00
Laurent Destailleur
37fce0d3ee
Fix position on merou
...
Fix preselected value on contact
2020-03-14 14:45:37 +01:00
Laurent Destailleur
0d2d2302d5
Removed not relevant graph on stats on project
2020-03-14 03:18:49 +01:00
Laurent Destailleur
3b72005f93
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cashdesk.lang
htdocs/langs/fr_FR/errors.lang
htdocs/langs/fr_FR/products.lang
htdocs/langs/fr_FR/projects.lang
2020-03-14 00:22:11 +01:00
Laurent Destailleur
99669583d5
Fix phpcs
2020-03-13 16:46:07 +01:00
Laurent Destailleur
d90bf25351
Fix phpcs
2020-03-13 13:11:04 +01:00
Laurent Destailleur
893ae21d3a
Fix phpcs
2020-03-13 11:29:27 +01:00
Laurent Destailleur
6dda972ff5
Doxygen
2020-03-13 04:12:42 +01:00
Laurent Destailleur
94589158c0
Move class from external project as internal class (project is dead)
2020-03-13 02:32:33 +01:00
Laurent Destailleur
967d4223c6
FIX #13277
2020-03-12 16:15:48 +01:00
simicar29
4f4b778c8c
update_price: add invoice_supplier element name
...
'invoice_supplier' as an element name was missing in test conditions to skip the update_price function
2020-03-12 12:53:17 +01:00
stickler-ci
aaf1081f17
Fixing style errors.
2020-03-12 11:46:41 +00:00
Scrutinizer Auto-Fixer
f413ce6aac
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-12 11:45:44 +00:00
Laurent Destailleur
c1e5178eeb
Doc
2020-03-12 12:01:40 +01:00
Laurent Destailleur
d6a35db754
Look and feel v12
2020-03-12 11:13:50 +01:00
Laurent Destailleur
61cb1ec81a
Merge pull request #13185 from atm-john/12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
...
NEW : Allow extrafields on pdf : extend to line desc
2020-03-11 17:12:14 +01:00
Laurent Destailleur
21dbddac76
Merge pull request #13317 from TobiasSekan/FixErrorOnAddLineToOrder
...
FIX Error on add a new line to a supplier order (with ODT templates)
2020-03-11 16:58:44 +01:00
Laurent Destailleur
2b8a06cb5e
FIX unit price for selected supplier products not set. NaN was used.
2020-03-11 16:12:34 +01:00
Laurent Destailleur
5adec1fe32
FIX unit price for selected supplier products not set. NaN was used.
2020-03-11 16:11:38 +01:00
Laurent Destailleur
1f5c8f682c
FIX cols parameter not propagated to tpl
2020-03-10 21:55:29 +01:00
Laurent Destailleur
d956222e36
FIX cols parameter not propagated to tpl
2020-03-10 21:54:50 +01:00
Tobias Sekan
60944c92a8
Fix error on add a line to a supplier order
2020-03-10 09:02:38 +01:00
Laurent Destailleur
cc1a02f0ea
Support of null values in graph
2020-03-09 22:52:30 +01:00
Laurent Destailleur
e1c7222172
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-09 20:39:05 +01:00
Laurent Destailleur
86f6736a18
Fix phpcs
2020-03-09 18:55:47 +01:00
Laurent Destailleur
ca4c62be56
Fix var init
2020-03-09 13:56:25 +01:00
Laurent Destailleur
067759bf04
Fix graph for lines
2020-03-08 20:22:46 +01:00
Laurent Destailleur
343a80fd3d
Fix table fields
2020-03-08 19:25:00 +01:00
Laurent Destailleur
6424e50ba4
Enhance of colors in graph
2020-03-07 16:45:28 +01:00
Laurent Destailleur
e6f68b9a29
Fix correct 'group by' when content is '0', '' or null
2020-03-06 20:02:05 +01:00
Jean Traullé
7c2bed2846
Fix #13296
2020-03-06 16:22:41 +00:00
Laurent Destailleur
d812249047
Move code into functions
2020-03-06 17:13:51 +01:00
Laurent Destailleur
cdec58a527
Clean old code
2020-03-06 15:05:18 +01:00
Laurent Destailleur
d0f22c7bff
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/boxes/box_graph_product_distribution.php
2020-03-06 14:22:42 +01:00
Laurent Destailleur
d4b67a6cef
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/contrat/list.php
htdocs/core/lib/functions.lib.php
2020-03-06 14:19:30 +01:00
Laurent Destailleur
0b8adbfc55
Merge pull request #13289 from atm-greg/Fix_countable_warning_on_homescreen
...
fix countable warning on home screen
2020-03-06 14:13:24 +01:00
Laurent Destailleur
ad9d0a3472
Fix graph of product distribution when too much record
2020-03-06 12:45:02 +01:00
Laurent Destailleur
e2396919d4
FIX chart of product distribution
2020-03-06 11:52:32 +01:00
atm-greg
eafff58a54
fix countable warning
2020-03-06 11:30:45 +01:00
Laurent Destailleur
c27f90958e
Code comment
2020-03-06 11:06:07 +01:00
Laurent Destailleur
4c6a4ade5b
Log
2020-03-06 11:02:40 +01:00
Laurent Destailleur
ea658ebe72
Fix setShowLegend with chartjs
2020-03-06 09:51:30 +01:00
Laurent Destailleur
f9546fc50e
Fix dolgraph
2020-03-06 09:21:04 +01:00
Laurent Destailleur
32ee3122ac
More accurate code
2020-03-06 02:24:24 +01:00
Laurent Destailleur
0ba2c53b02
Fix translation of graph
2020-03-06 01:42:42 +01:00
Laurent Destailleur
7b5f9e1b11
Fix graph
2020-03-06 01:29:59 +01:00
Laurent Destailleur
52c236570b
Work on the generic Graphic Reporting tool
2020-03-06 01:18:35 +01:00
Laurent Destailleur
0bd2740779
NEW Can force position of legend of graph on right (instead of top)
2020-03-05 17:23:19 +01:00
Laurent Destailleur
ddb26d7a8f
NEW Add graph type 'piesemicircle'
2020-03-05 16:30:55 +01:00
kamel
0123fa7696
FIX subsitute lines dates values on doc generator (ODT, ...)
2020-03-05 15:37:01 +01:00
Laurent Destailleur
fc31680bd0
Several fix for chart.js graphs
2020-03-05 02:55:06 +01:00
Laurent Destailleur
74fa8d90e7
Use status of member colors into pie chart
2020-03-05 01:38:41 +01:00
Laurent Destailleur
a98b65ad99
FIX #13274 cannot add or update 0 value for an int or double extrafield
...
type
2020-03-05 00:43:51 +01:00
Laurent Destailleur
aa1552dbc0
Enhance graphs
2020-03-05 00:17:16 +01:00
Laurent Destailleur
d0839350db
NEW Move engine to build charts from jflot to chart.js
2020-03-04 23:30:41 +01:00
Laurent Destailleur
2b6aaa652d
Merge pull request #13256 from ATM-Marc/NEW_list_multicurrency
...
NEW: add multicurrency columns to document lists
2020-03-03 23:12:53 +01:00
Laurent Destailleur
760afd6838
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-02 23:28:12 +01:00
Laurent Destailleur
481ea6296e
No more need fo this constant. Use the generic default feature instead
2020-03-02 23:28:01 +01:00
Laurent Destailleur
55093f9ff2
Merge pull request #13232 from TobiasSekan/NewCategoriesInStocks
...
NEW Category filter for warehouse list
2020-03-02 22:50:08 +01:00
Laurent Destailleur
6d01aee2f2
Merge pull request #13246 from Dolibarr/11.0
...
Can process lang files with windows format (even if all lang files must have linux format)
2020-03-02 21:46:27 +01:00
Sekan, Tobias
f325c63055
Merge branch 'NewCategoriesInStocks' of https://github.com/TobiasSekan/dolibarr into NewCategoriesInStocks
2020-03-01 14:50:27 +01:00
Sekan, Tobias
754058b990
Fix lint errors
2020-03-01 14:50:22 +01:00
stickler-ci
a6b2531fd0
Fixing style errors.
2020-03-01 13:46:49 +00:00
Sekan, Tobias
0e55495c3e
adress feedback
2020-03-01 14:45:51 +01:00
Laurent Destailleur
bb5b55f9e3
Merge pull request #13225 from prietojc/patch-13
...
Update translate.class.php
2020-02-29 12:58:32 +01:00
Laurent Destailleur
00483e4e85
NEW Add hook getInputIdProf. Better solution for #13228
2020-02-29 12:32:27 +01:00
Laurent Destailleur
dea8525a6c
NEW X-Axis on graph are show vertical when there is a lot of values.
2020-02-29 01:26:24 +01:00
Laurent Destailleur
f0d458682d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-29 00:15:17 +01:00
Laurent Destailleur
e35bba358f
Fix error when generating documents
2020-02-29 00:13:42 +01:00
Laurent Destailleur
bfb9739ae8
Fix manufacuring efficiency on bom lines.
2020-02-28 16:12:42 +01:00
Laurent Destailleur
e07a29ecd0
Fix class not found
2020-02-27 22:02:45 +01:00
Laurent Destailleur
2d841d9d83
Debug multilang website
2020-02-27 21:43:11 +01:00
Laurent Destailleur
a3e56994b6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/admin/company.php
htdocs/compta/tva/document.php
htdocs/core/lib/files.lib.php
htdocs/main.inc.php
2020-02-27 18:35:32 +01:00
Laurent Destailleur
baaa6b797b
FIX SQl syntax error
2020-02-27 17:51:31 +01:00
Laurent Destailleur
a0b465e8ae
Fix sql error
2020-02-27 17:43:59 +01:00
Laurent Destailleur
eac07aceb0
Responsive
2020-02-27 16:00:01 +01:00
Marc de Lima Lucio
6d728f12ba
NEW: invoice list: enable multicurrency columns
2020-02-27 14:10:00 +01:00
JC Prieto
c555a2c588
Update translate.class.php
...
Resolve bug #9105
When load() function loads translation file from an external modules, adds a \r simbol at the end of each line.
2020-02-27 09:32:22 +01:00
Laurent Destailleur
9bc5eb44ca
FIX #13182
2020-02-26 20:25:26 +01:00
Laurent Destailleur
0646b1a7a9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ihm.php
2020-02-26 17:04:14 +01:00
Laurent Destailleur
ab01acfe53
Merge pull request #13211 from ATM-Marc/FIX_11.0_excess_paid_from_situation_invoice
...
FIX: excess paid from situation invoices not counted when calculating remain to pay
2020-02-26 16:30:20 +01:00
Laurent Destailleur
b52cfe58d6
FIX Disable js if no javascript
2020-02-26 15:45:12 +01:00
Laurent Destailleur
35e886fb12
FIX Disable js if no javascript
2020-02-26 15:22:23 +01:00
Marc de Lima Lucio
d3b70994fe
Merge branch 'FIX_8.0_excess_paid_from_situation_invoice' of github.com:ATM-Marc/dolibarr into FIX_11.0_excess_paid_from_situation_invoice
2020-02-26 10:42:55 +01:00
Marc de Lima Lucio
373ab3bc01
FIX: excess paid from situation invoices not counted when calculating remain to pay
2020-02-26 10:35:43 +01:00
Laurent Destailleur
b7b2d3562b
Merge pull request #13195 from oscim/patch-24
...
Update commonobject.class.php
2020-02-26 05:14:27 +01:00
Laurent Destailleur
59137f0f47
Merge pull request #13190 from oscim/patch-23
...
Update commonobject.class.php
2020-02-25 12:05:22 +01:00
ATM john
c216b7cae5
fix title padding definition source
2020-02-24 22:34:34 +01:00
ATM john
7b6faf7063
Merge branch '12.0_new_allow_extrafields_on_pdf_extend_to_line_desc' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
2020-02-24 22:16:10 +01:00
ATM john
9c1fdf1c52
Fix missing php doc
2020-02-24 22:12:36 +01:00
stickler-ci
5a77716b93
Fixing style errors.
2020-02-24 21:10:14 +00:00
ATM john
3e492b8a5b
Fix title padding
2020-02-24 22:08:04 +01:00
ATM john
ae890d021c
Fix comments
2020-02-24 21:50:01 +01:00
ATM john
7f2dd19bb0
Fix pdf cell padding for model cyan, erathosthene, espadon, cornas
2020-02-24 21:43:33 +01:00
stickler-ci
6de74e774e
Fixing style errors.
2020-02-24 19:50:07 +00:00
ATM john
3c4e7f7b07
Fix cell padding sponge
2020-02-24 20:47:19 +01:00
oscim
65f3e5466e
Update commonobject.class.php
...
add path class for support type project or projet in element_element
2020-02-24 17:51:11 +01:00
stickler-ci
d07e2ab8fb
Fixing style errors.
2020-02-24 16:44:46 +00:00
oscim
fe4bd46c43
Update commonobject.class.php
...
add support of contact linkedobject
2020-02-24 17:28:25 +01:00
Tobias Sekan
7baba2ba43
Add line number substitution
2020-02-24 14:55:02 +01:00
John Botella
06b2d459c0
Fix cell padding
2020-02-24 14:18:49 +01:00
oscim
6c7a534018
Update commonobject.class.php
...
Add support of project/projet in objectlinked
2020-02-24 11:49:12 +01:00
ATM john
41c18a7884
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
2020-02-24 00:01:50 +01:00
Laurent Destailleur
096a568e83
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2020-02-23 23:42:23 +01:00
stickler-ci
fab34d5114
Fixing style errors.
2020-02-23 22:40:41 +00:00
ATM john
0c2d08cdd9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
2020-02-23 23:36:43 +01:00
Laurent Destailleur
ee45c3efb6
FIX #13184
2020-02-23 23:29:13 +01:00
ATM john
acacbfd85e
Fix list separator on first loop
2020-02-23 23:17:10 +01:00
ATM john
316fa4068a
revert commit fdfc45bbe9 and fix y position
2020-02-23 23:14:01 +01:00
ATM john
5ecef88b35
allow in extrafield conf to choose to add extrafield in a new col or append it to description, it could be useful for html or long text extrafields
2020-02-23 23:04:24 +01:00
Laurent Destailleur
ca39c680c7
Rename field documentpdf into printable (this field already exists due
...
to a very old PR nofinished for same goal).
2020-02-23 23:03:17 +01:00
Laurent Destailleur
90565e4637
Merge pull request #13179 from atm-john/12.0_new_allow_extrafields_on_pdf
...
NEW allow display extrafields on pdf
2020-02-23 22:55:16 +01:00
Laurent Destailleur
cac61c223d
Merge pull request #13176 from andreubisquerra/master
...
Add orders to Receipt Printer module
2020-02-23 22:44:14 +01:00
Laurent Destailleur
76e33058a8
NEW Can select several fields to personalize list before submit.
2020-02-23 21:38:24 +01:00
ATM john
f611e4fc0e
Merge branch '12.0_new_allow_extrafields_on_pdf' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf
2020-02-23 20:53:50 +01:00
ATM john
07bd6e1fc0
Fix On admin page add extrafields form, display on pdf option doesn't saved
2020-02-23 20:52:44 +01:00
stickler-ci
222a000d31
Fixing style errors.
2020-02-23 14:27:22 +00:00
ATM john
8a279ed124
improve extrafields display in notes
2020-02-23 15:24:59 +01:00
ATM john
679e2fd186
Merge branch '12.0_new_allow_extrafields_on_pdf' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf
2020-02-23 11:36:06 +01:00
ATM john
fe4e00b139
Add new params to extrafields forms to allow extrafields to be displayed on pdf documents
2020-02-23 11:32:38 +01:00
stickler-ci
d575188d80
Fixing style errors.
2020-02-23 09:11:58 +00:00
ATM john
ff6dc735ee
fix extrafield conf cache
2020-02-23 10:09:47 +01:00
stickler-ci
281e059487
Fixing style errors.
2020-02-23 01:28:30 +00:00
ATM john
8c36dd0ad8
add extrafields in notes
2020-02-23 02:26:21 +01:00
stickler-ci
2b027cfebf
Fixing style errors.
2020-02-22 15:45:39 +00:00
ATM john
e209fd2973
Add extrafields on PDF object lines
2020-02-22 16:27:44 +01:00
javierybar
fddcc844ff
Add orders to Receipt Printers module
2020-02-22 11:30:48 +01:00
Scrutinizer Auto-Fixer
e44865d8b5
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-21 16:53:37 +00:00
Laurent Destailleur
55bef402c4
Fix remove a lot of warnings on Eclipse
2020-02-21 17:47:36 +01:00
Laurent Destailleur
7e4af04886
CSS For bookmark dropdown
2020-02-21 17:18:01 +01:00
Laurent Destailleur
be3ecb3093
Remove hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless
2020-02-21 14:32:53 +01:00
Laurent Destailleur
7909055ee8
Enhance multilangue support in website module
2020-02-21 11:36:16 +01:00
Laurent Destailleur
c29e1e78f3
NEW Bookmarks are now in top menu bar
2020-02-20 15:43:31 +01:00
Laurent Destailleur
ac5e9ce5b3
Fix doc
2020-02-20 01:34:33 +01:00
Laurent Destailleur
5c48f6f405
Lang of web site is optional
2020-02-20 01:08:53 +01:00
Laurent Destailleur
895503d2eb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/index.php
htdocs/core/class/CMailFile.class.php
2020-02-20 00:21:25 +01:00
Laurent Destailleur
1dd5ba093d
Prepare PHP v8 - mktime() and gmmktime() are no more allowed
2020-02-19 12:11:16 +01:00
Laurent Destailleur
ac16857501
GETPOST(..., 'alpha') remove " if found instead of returning ''
2020-02-19 11:33:45 +01:00
Laurent Destailleur
7c07589850
FIX #13124
2020-02-19 03:07:12 +01:00
Laurent Destailleur
016c7ad875
FIX #13135
2020-02-19 01:17:16 +01:00
Scrutinizer Auto-Fixer
fd48877dc6
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-18 22:47:25 +00:00
Laurent Destailleur
a6b0fec90b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/exports/class/export.class.php
2020-02-17 12:35:34 +01:00
Laurent Destailleur
504a67daee
FIX duplicate class name into some log lines
2020-02-17 12:34:00 +01:00
Laurent Destailleur
1904ae0e82
FIX Type of contact for event does not exists and not supported
...
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-02-17 12:25:51 +01:00
Laurent Destailleur
549bf076d7
Fix prefix of log
2020-02-17 12:22:52 +01:00
Laurent Destailleur
a02f5cde92
FIX Type of contact for event does not exists and not supported
...
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER
2020-02-17 12:21:07 +01:00
Laurent Destailleur
20797920d7
Fix phpcs
2020-02-16 19:35:52 +01:00
Laurent Destailleur
f4f3efec62
Fight against $_POST
2020-02-16 19:33:58 +01:00
Laurent Destailleur
dc3a15945d
Add method getKanbanView()
2020-02-16 12:05:00 +01:00
Laurent Destailleur
6c9fb06292
Perf
2020-02-15 10:56:44 +01:00
Scrutinizer Auto-Fixer
011803ac71
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-13 11:36:05 +00:00
Laurent Destailleur
46bccf88d3
Fix var not initialized
2020-02-13 12:33:34 +01:00
Laurent Destailleur
9e165a782f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-13 11:58:23 +01:00
Laurent Destailleur
78d4978d31
FIX #13100
2020-02-13 11:26:11 +01:00
Scrutinizer Auto-Fixer
17010478ba
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-13 09:44:08 +00:00
Laurent Destailleur
4981da235c
Fix phpcs
2020-02-12 22:00:44 +01:00
Laurent Destailleur
4a5467234d
Merge pull request #13074 from simicar29/simicar29-patch-4
...
Show extrafields only when enabled
2020-02-12 18:47:32 +01:00
Laurent Destailleur
4678c7ef7a
Merge pull request #13081 from bb2a/patch-14
...
Constant MAIN_DEFAULT_PAYMENT_TYPE_ID can used to set default value
2020-02-12 18:46:08 +01:00
Laurent Destailleur
74d3912763
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
2020-02-11 16:52:58 +01:00
