lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
91,219 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-1
Commit Graph

1740 Commits

Author SHA1 Message Date
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
Laurent Destailleur
8645fd8946 FIX CVE-2019–17223 FIX #13053 2020-02-09 18:28:57 +01:00
Laurent Destailleur
33addfab01 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-08 17:21:17 +01:00
Laurent Destailleur
81df5cd9ab Merge pull request #13032 from atm-florianm/FIX_11.0_select_extrafield_filtering 
FIX 11.0 - default filtering for 'select' extrafields should use "=", not "LIKE"
 2020-02-08 17:16:01 +01:00
Laurent Destailleur
ee29c3efdd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-08 16:02:23 +01:00
Laurent Destailleur
716f765ce1 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
 2020-02-08 16:00:06 +01:00
Laurent Destailleur
c27260869b FIX #13046 More complete 2020-02-08 15:59:08 +01:00
Laurent Destailleur
df7cdd1da8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/tools/export_files.php
	htdocs/comm/mailing/class/advtargetemailing.class.php
	htdocs/core/tpl/advtarget.tpl.php
 2020-02-08 15:42:35 +01:00
atm-arnaud
bd6d49f04a FIX advanced target emailing sql and ergonomy 2020-02-06 12:08:50 +01:00
Florian Mortgat
eb17a52027 FIX 11.0 - default filtering for extrafields of type 'select' should not use a LIKE "%value%" condition because keys might overlap 2020-02-05 14:57:40 +01:00
Laurent Destailleur
1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
 2020-02-05 14:53:47 +01:00
Laurent Destailleur
c367c6f34e Avoid warning 2020-02-03 21:17:45 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
df478dc170 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-27 01:53:49 +01:00
Laurent Destailleur
d13e5bc90b FIX #12875 2020-01-26 23:22:47 +01:00
Laurent Destailleur
3215af9900
Merge pull request #12923 from simicar29/develop 
New: Add Hook doPreMassActions
 2020-01-26 22:32:46 +01:00
Laurent Destailleur
02f8faeeac
Update massactions_pre.tpl.php 2020-01-26 22:32:37 +01:00
Laurent Destailleur
09e707b818 trans 2020-01-25 13:05:40 +01:00
stickler-ci
cfa67b6a5d Fixing style errors. 2020-01-24 08:47:11 +00:00
simicar29
4761671fc8
Add Hook doPreMassActions 
Add Hook doPreMassActions to allow dedicated form display for custom mass actions
 2020-01-24 09:41:22 +01:00
Laurent Destailleur
18f2b09fb1 Debug v11 2020-01-20 12:25:25 +01:00
Laurent Destailleur
0ebed529e1 FIX #12872 2020-01-17 15:27:43 +01:00
Laurent Destailleur
ad7278e6a5 FIX Label of DEPOSIT on screen 
Fix look and feel v11
 2020-01-16 02:48:24 +01:00
Laurent Destailleur
f48c7d2ecf Fix modulebuilder 2020-01-09 22:31:23 +01:00
Laurent Destailleur
255c280170 Fix visibility 2020-01-09 11:44:15 +01:00
Laurent Destailleur
115b7f2c6b Fix break on second column 2020-01-09 11:05:23 +01:00
Laurent Destailleur
d80764a179 Fix column not visible after switching column when visibility=3 2020-01-07 12:43:05 +01:00
Laurent Destailleur
b98251f7b0 Fix phpcs 2020-01-01 23:14:13 +01:00
Laurent Destailleur
607d013a9d Fix phpcs 2020-01-01 23:01:42 +01:00
Laurent Destailleur
b90dbb585a Fix ident 2020-01-01 22:45:47 +01:00
Laurent Destailleur
7d07c198bc FIX Price of purchase order and vendor invoice with multicurrency 
FIX entering predefined product with a forced unit price
 2020-01-01 17:15:26 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
c8baaa2995 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-16 12:06:25 +00:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Laurent Destailleur
0b73cdb7cc Fix use of currency accuracy 2019-12-11 17:14:32 +01:00
Laurent Destailleur
6ac5e1a4f3
Merge pull request #12601 from TobiasSekan/FixAddFolderSymbolAccess 
Fix style of add folder button based on rights
 2019-12-03 13:46:21 +01:00
Laurent Destailleur
2d95544abd
Update filemanager.tpl.php 2019-12-03 13:46:12 +01:00
Scrutinizer Auto-Fixer
36a74cd160 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-03 10:17:29 +00:00
Tobias Sekan
d7a8fb98fc
Fix style of add folder button based on rights 2019-12-02 13:02:16 +01:00
Laurent Destailleur
d900475c5d
Merge pull request #12571 from inoveaconseil/FIX#12473 
Fix#12473
 2019-12-01 12:42:01 +01:00
Laurent Destailleur
6bf3af5d83 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 
Conflicts:
	htdocs/compta/tva/index.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
 2019-12-01 10:30:22 +01:00
ATM John BOTELLA
773f823748 factoring token usage 2019-12-01 10:20:11 +01:00
Laurent Destailleur
1d564c2a39 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/core/class/notify.class.php
 2019-12-01 00:58:01 +01:00
Maxime Kohlhaas
558669dd88 Fix #6497 : deposit lines were not translated 2019-11-30 16:14:16 +01:00
stickler-ci
a13b2267aa Fixing style errors. 2019-11-30 14:22:25 +00:00
Nicolas
fd7a18c26f FIX #12473 2019-11-30 12:49:31 +01:00
Laurent Destailleur
58c38912ab Fix action into actionlogin to avoid conflict 2019-11-20 16:42:18 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:15 +00:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:06 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:02 +00:00
Laurent Destailleur
545c2207b2 Fix on exact date when we don't know the second is useless 2019-11-13 19:32:27 +01:00
Laurent Destailleur
b9900c20cc
Merge pull request #11035 from atm-ph/new_search_input_on_type_list 
NEW show html list instead input text for extrafields typed as list
 2019-11-13 19:26:19 +01:00
Laurent Destailleur
bdf0219941 Missing link to create contact 
Fix css
 2019-11-13 18:18:45 +01:00
Laurent Destailleur
74239d48bf Fix translation of extrafields when $extralabels not loaded 2019-11-13 11:11:08 +01:00
Laurent Destailleur
dc77a58a73 Work on MO 2019-11-12 01:48:12 +01:00
Laurent Destailleur
03e35623c6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-12 00:43:37 +01:00
Laurent Destailleur
8be0a6d470 Fix: Can set savingdocmask by caller. Fix permissions names. 
Fix: Disable crop on svg images.
 2019-11-12 00:43:26 +01:00
Scrutinizer Auto-Fixer
038bda254d Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-11 22:59:36 +00:00
Laurent Destailleur
814dce5b55 Fix var not defined 2019-11-11 19:26:19 +01:00
Laurent Destailleur
6a4ba74ee7 Fix regression introduced by 991e1b2747 2019-11-11 13:17:36 +01:00
Laurent Destailleur
6990732c71 Fix missing action in POST 2019-11-10 13:49:04 +01:00
Laurent Destailleur
6233f8e1c5 Fix visibility = 3 2019-11-09 18:19:04 +01:00
Laurent Destailleur
94fce39562 Fix visibility on modulebuilder 2019-11-09 18:13:59 +01:00
Laurent Destailleur
f11943126a Fix scrutinizer 2019-11-08 09:42:39 +01:00
Laurent Destailleur
c0b8684475
Merge pull request #12341 from inoveaconseil/bankStatementDocument 
NEW add upload for account statement
 2019-11-07 15:06:47 +01:00
Nicolas
f18bca7687 Merge remote-tracking branch 'origin/bankStatementDocument' into bankStatementDocument 2019-11-06 20:51:17 +01:00
Inovea Conseil
fed6ed8760 Merge remote-tracking branch 'Dolibarr/develop' into bankStatementDocument 2019-11-06 20:48:24 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
stickler-ci
f537ae60b6 Fixing style errors. 2019-11-05 12:52:58 +00:00
Nicolas
991e1b2747 NEW Add upload document on account statement 2019-11-05 13:51:52 +01:00
Laurent Destailleur
7ab19ef66b Fix selection not lose if creation of vendor invoice fails 2019-11-05 13:34:25 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Laurent Destailleur
6f82c212a0 Finished migration to the new architecture of extrafields 2019-11-02 17:38:19 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid 
replace deprecated user->societe_id by user->socid
 2019-11-02 13:34:21 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
stickler-ci
8765e7648e Fixing style errors. 2019-10-31 11:03:46 +00:00
atm-ph
526aeab9af Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_search_input_on_type_list 2019-10-31 12:02:53 +01:00
atm-ph
2f68a73a2a New update comments is now available 2019-10-30 15:45:04 +01:00
Frédéric FRANCE
8f6d38ee82
clean indent 2019-10-27 17:01:23 +01:00
Laurent Destailleur
fd04729727 Fix tooltip on extrafield title was on wrong line. 2019-10-23 20:35:39 +02:00
Laurent Destailleur
a8ca8c7a1f Fix edit of extrafields link when empty 2019-10-23 16:38:15 +02:00
Laurent Destailleur
da00591bba Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/product.lib.php
	htdocs/expedition/card.php
	htdocs/product/list.php
 2019-10-23 04:04:32 +02:00
Laurent Destailleur
161f2a018f Fix responsive and bad closing td 2019-10-23 03:50:48 +02:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
78bfc8997d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/link.class.php
 2019-10-11 16:14:29 +02:00
Laurent Destailleur
868bfb518b FIX #11702 FIX #12088 2019-10-11 15:08:10 +02:00
Laurent Destailleur
99da69fb69 NEW Can edit the price of predefined product during adding in documents 2019-10-07 21:01:52 +02:00
Laurent Destailleur
539f4355c3 Try to fix stickler 2019-10-07 20:48:44 +02:00
Laurent Destailleur
c2a7ae23bc
Merge pull request #12034 from aspangaro/11_faicon 
Fix Fa-icon
 2019-10-07 13:03:27 +02:00
Laurent Destailleur
a3d0b9e374 Fix syntax error 2019-10-06 18:11:28 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Laurent Destailleur
76dad97cb1 Fix syntax error 2019-10-06 14:39:43 +02:00
Laurent Destailleur
6743169faa Fix js syntax error 2019-10-06 14:34:24 +02:00
Alexandre SPANGARO
ddadff5731 Add globe fa-icon 2019-10-03 21:32:55 +02:00
Laurent Destailleur
aa484d484d css 2019-10-03 19:02:29 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
d8de78dca9
Merge pull request #11984 from fuhraih/develop 
Fix 11554 and 7533
 2019-09-30 15:31:41 +02:00
Laurent Destailleur
d2881eb85b FIX CSS 
Conflicts:
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
 2019-09-29 19:26:37 +02:00
Laurent Destailleur
8acf7298b2 FIX CSS 2019-09-29 19:22:01 +02:00
obrunet
3e4e64ab1a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2019-09-27 21:36:35 +02:00
fuhraih
40a8fe3e79 FIX #11554 Extrafields: members autosubscription formular issue 2019-09-27 21:26:06 +02:00
Laurent Destailleur
138b494b98
Merge pull request #11936 from aspangaro/11.0_translation 
Translate and some fix
 2019-09-27 12:15:50 +02:00
Laurent Destailleur
b3c49f2ec8 End of dev for extrafields on holiday 2019-09-24 16:26:15 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
278312f38f Translate 2019-09-20 07:02:14 +02:00
Laurent Destailleur
5cc0b24f6f Fix param 2019-09-08 21:24:01 +02:00
Laurent Destailleur
5d6ccfdf00 Fix phpcs 2019-09-07 13:12:39 +02:00
Laurent Destailleur
881b69d117
Merge branch 'develop' into Edit_priceHT_for_predefined_products 2019-09-07 11:29:49 +02:00
Laurent Destailleur
eb7f964268
Update objectline_create.tpl.php 2019-09-07 11:25:11 +02:00
Laurent Destailleur
7386ba61d7
Merge pull request #11673 from ptibogxiv/patch-221 
NEW display supplier in objectline if defined
 2019-09-07 10:50:32 +02:00
Laurent Destailleur
165f64463b Fix look and feel v10 2019-09-06 12:46:54 +02:00
Laurent Destailleur
123eace8c0 Fix look and feel v10 2019-09-06 12:44:23 +02:00
Laurent Destailleur
bbda4269b2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 17:55:21 +02:00
Laurent Destailleur
e09223ed4d FIX #11702 2019-08-27 17:52:46 +02:00
Maxime Kohlhaas
9c09876bd4 Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_choose_lines_from_origin 2019-08-27 14:33:34 +02:00
Laurent Destailleur
290766acaa Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-26 23:57:15 +02:00
ptibogxiv
ad38478fc6
Fix lang for "nature" in contact 2019-08-26 20:01:05 +02:00
Laurent Destailleur
999db7ed41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/salaries/card.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/takepos/invoice.php
 2019-08-26 16:49:25 +02:00
Laurent Destailleur
0c8640bfd9 FIX #11752 2019-08-26 16:09:20 +02:00
Laurent Destailleur
d2d7fb4b04 Fix management of collapsing of extrafields separators. 2019-08-21 03:38:57 +02:00
Laurent Destailleur
2510c1e5e4 Better help text 2019-08-16 03:05:55 +02:00
Laurent Destailleur
c131af5ae1 FIX #11672 2019-08-15 19:16:52 +02:00
ptibogxiv
b06bfef632
NEW display supplier in objectline if defined 2019-08-11 13:08:17 +02:00
wdammak
909dbfab96
Update objectline_edit.tpl.php 
optimization code (double declaration deletion)
 2019-08-10 16:35:02 +02:00
Laurent Destailleur
76d721559c
Merge pull request #11630 from hregis/9.0_html 
FIX adding a "div" for better interaction with login submit button
 2019-08-10 01:41:19 +02:00
Regis Houssin
e81ccf1cff FIX addinf a "div" for better interaction with login submit button 2019-08-04 17:21:13 +02:00
Laurent Destailleur
34f78c555d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-30 20:55:35 +02:00
Laurent Destailleur
e54c6fb5e2 FIX #11460 FIX #11492 FIX #11576 FIX #11590 2019-07-30 19:30:56 +02:00
Laurent Destailleur
a871aa818b FIX #11460 FIX #11492 FIX #11576 FIX #11590 2019-07-30 18:15:04 +02:00
Maxime Kohlhaas
5c2763d0dd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_choose_lines_from_origin 2019-07-27 10:53:43 +02:00
Laurent Destailleur
d6d1b29257 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-21 16:15:32 +02:00
Laurent Destailleur
4f34a8b6e8 FIX Position was lost when we edit the line of template invoice 2019-07-21 16:15:13 +02:00
Laurent Destailleur
932530bd37 FIX ajax call for line positioning when CSRFCHECK_WITH_TOKEN is on 2019-07-21 16:00:32 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +02:00
Laurent Destailleur
b9fe874b5f Revert "Merge pull request #11022 from altatof/freetext" 
This reverts commit 879b4d8e7f, reversing
changes made to ddc01b4c27.
 2019-07-18 18:19:51 +02:00
Laurent Destailleur
879b4d8e7f
Merge pull request #11022 from altatof/freetext 
NEW : manage output languages for free text
 2019-07-18 17:29:45 +02:00
Laurent Destailleur
f44182c89f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-16 00:13:52 +02:00
Regis Houssin
294bc5dcb5 FIX avoid conflict with "$classname" in card.php 2019-07-15 10:19:06 +02:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Laurent Destailleur
b1e21ed5fc FIX Computed field were not calculated into lists. 2019-07-11 22:18:44 +02:00
atm-lena
a3f5397988 FIX help text 2 2019-07-10 15:55:50 +02:00
atm-lena
cebf81a514 FIX helpp text 2019-07-10 15:18:25 +02:00
Maxime Kohlhaas
9c47cb6f91 NEW : can choose lines while creating order from origin 2019-07-08 23:16:32 +02:00
Laurent Destailleur
01b1b2e4a7 Fix syntax error 2019-07-04 17:07:26 +02:00
Laurent Destailleur
1c33dd2e75
Merge pull request #11436 from fbosman/fbosman-patch-1 
Feature request: Extrafields - store computed value #11435
 2019-07-04 16:23:08 +02:00
Laurent Destailleur
0d738a04f9
Update admin_extrafields_edit.tpl.php 2019-07-04 16:22:10 +02:00
Laurent Destailleur
f14b0b4fcc
Update admin_extrafields_add.tpl.php 2019-07-04 16:20:01 +02:00
Laurent Destailleur
b691396fce
Update admin_extrafields_add.tpl.php 2019-07-04 16:19:24 +02:00
Laurent Destailleur
f2c1568d09 NEW Extrafields separator can be collapsed or not 2019-07-04 15:43:05 +02:00
Frans Bosman
9962243df3
Update admin_extrafields_edit.tpl.php 2019-07-03 16:19:51 +02:00
Frans Bosman
123cf7ce50
Update admin_extrafields_add.tpl.php 2019-07-03 16:16:45 +02:00
Frans Bosman
135e47892b
Update admin_extrafields_add.tpl.php 2019-07-03 16:15:20 +02:00
Laurent Destailleur
2a3b4c3fd7
Merge pull request #11111 from OPEN-DSI/new-extrafields-separator-collapse 
NEW add extrafield separator collapsing capabilities
 2019-06-24 19:04:51 +02:00
Laurent Destailleur
b98874848f Fix backport 9.0 2019-06-24 16:12:54 +02:00
Laurent Destailleur
3c4956838e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-06-24 15:44:44 +02:00
John Botella
6a68c8cd99 Fix display option email per participient 2019-06-20 11:09:37 +02:00
John Botella
252bd6d9ba FIX condition 2019-06-20 09:48:08 +02:00
Laurent Destailleur
0123a18ff8 Look and feel v10 2019-06-17 18:44:08 +02:00
Laurent Destailleur
2ac8723ce9 Code comment 2019-06-11 21:02:41 +02:00
Laurent Destailleur
7d2cedfdcf Debug bom module 2019-06-03 19:29:49 +02:00
ptibogxiv
5b6821c191
FIX display job/fucnction in contact list 
Display job/function is usefull for correct choice of additionnal contact in a object (PR from returns of severals professionnal dolibarr's user)
 2019-05-29 16:55:44 +02:00
Laurent Destailleur
a5865d3e4a Debug BOM 2019-05-25 19:29:33 +02:00
Laurent Destailleur
ccfb4f575b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2019-05-24 15:00:14 +02:00
Laurent Destailleur
89455672a2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2019-05-24 14:58:21 +02:00
Marc de Lima Lucio
18a6ed17cf FIX: extrafield list search: SQL error when field is multiselect 2019-05-21 14:49:23 +02:00
Laurent Destailleur
eafc35b00f Look and feel v10 2019-05-21 13:27:45 +02:00
Laurent Destailleur
c3732f2b7a Fix edition of margins in recurring invoices 2019-05-20 14:41:47 +02:00
Laurent Destailleur
3c1b860da4 Fix css 2019-05-20 12:16:39 +02:00
Laurent Destailleur
d86fc28aba Fix CSS 2019-05-19 13:01:11 +02:00
Marc de Lima Lucio
d428f79d46 NEW: new line template: hidden conf to fill service dates from the last service line 2019-05-15 12:26:39 +02:00
Laurent Destailleur
e84003d4ff Escape param 2019-05-13 09:29:34 +02:00
Laurent Destailleur
74875690a0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-05-08 19:14:31 +02:00
Laurent Destailleur
f6de2d091d FIX Sending email to mass actions send same email on same customer 2019-05-08 19:07:12 +02:00
Lionel VESSILLER
8bb4b3f339 Fix contact address substitution before sending by mail in shipment card 2019-05-06 11:12:56 +02:00
Lionel VESSILLER
87e83a7967 New add extrafield separator collapse with theses specific values 
- empty for a simple separator
- 1 to extend by default all extrafields after the separator position
- 2 to collapse by default all extrafields after the separator position
 2019-05-03 16:14:44 +02:00
Laurent Destailleur
425dd6faf7
Merge branch 'develop' into patch-2 2019-05-02 12:38:38 +02:00
Laurent Destailleur
ceeb9752ce Fix PHPCS 2019-05-02 12:28:40 +02:00
Frédéric FRANCE
ac304f58b0
clean new commits 2019-04-30 20:37:59 +02:00
Laurent Destailleur
61bf731d17 FIX Balance of td 2019-04-30 18:11:35 +02:00
Laurent Destailleur
9c45b781af Fix balance of colspan 2019-04-30 16:44:11 +02:00
Laurent Destailleur
3007905508 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/core/modules/modService.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/stripe/class/stripe.class.php
 2019-04-30 03:30:40 +02:00
Laurent Destailleur
ef8bb1f5ca Add MAIN_DOLEDITOR_HEIGHT as quick hack to fix pb of too small area 2019-04-29 20:55:45 +02:00
Laurent Destailleur
10dde837d0 Debug email collector 2019-04-25 19:32:48 +02:00
Laurent Destailleur
68d438b697 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/user/class/user.class.php
 2019-04-25 01:50:48 +02:00
Laurent Destailleur
fe3fe60efc Cleaner setup page 2019-04-24 18:31:11 +02:00
Laurent Destailleur
287b8ebe53
Merge pull request #11060 from hregis/9.0_mc 
FIX missing compatibility with multicompany
 2019-04-24 11:33:16 +02:00
Laurent Destailleur
99639ef429 FIX #11013 2019-04-24 11:25:14 +02:00
Laurent Destailleur
f0bb9288bf FIX #11013 2019-04-24 11:23:49 +02:00
Regis Houssin
41a82023e3 FIX missing compatibility with multicompany 2019-04-24 08:17:10 +02:00
Christophe Battarel
0b5cb9770f use dol_escapa_js 2019-04-18 09:59:39 +02:00
atm-ph
1e087b68e1 New show html list instead input text for extrafields typed as list 2019-04-17 16:29:48 +02:00
Christophe Battarel
20953d3522 fix javascript 2019-04-16 17:36:42 +02:00
Christophe Battarel
62f59a13af fix javascript 2019-04-16 17:30:57 +02:00
Christophe Battarel
f4cc1695f4 fix when ckeditor is not enabled 2019-04-16 17:22:33 +02:00
Christophe Battarel
c157cfad74 add freetextsubstitutionexclude parameter 2019-04-16 16:21:32 +02:00
Christophe Battarel
502b1e4d31 add lang management to freetext 2019-04-16 16:16:37 +02:00
Laurent Destailleur
7db0c0c705
Merge pull request #10993 from altatof/presend 
NEW : use outputlangs in fullname construction for emails
 2019-04-11 16:33:07 +02:00
Laurent Destailleur
862917edff NEW Tooltip with vat amount and price incl tax on lines of objects. 2019-04-10 21:24:23 +02:00
Laurent Destailleur
2eeb4b8734 Debug ticket module 2019-04-10 15:45:55 +02:00
Laurent Destailleur
ac25003d33 Dolibarize module ticket 2019-04-10 11:39:54 +02:00
Christophe Battarel
79beb59385 use outputlangs in fullname construction for emails 2019-04-10 11:11:41 +02:00
Laurent Destailleur
861c1b412c CSS 2019-04-09 19:23:34 +02:00
Laurent Destailleur
ff629b2355 NEW Color for hover and for checked line is on by default 2019-04-09 15:57:26 +02:00
Laurent Destailleur
f9860e1425 Work on email collector 2019-04-09 13:23:30 +02:00
Laurent Destailleur
1b415a6aed Fix translation of help tooltip on fields for modulebuilder. 2019-04-08 14:42:46 +02:00
Laurent Destailleur
2b5e25188c
Merge pull request #10977 from IonAgorria/resources-product 
NEW: Resources tab possible in products/services
 2019-04-08 13:57:30 +02:00
Ion
b64cb4129f Add resources tab for products/services 2019-04-07 23:52:49 +02:00
atm-ph
285e60e9f1 Fix default filter 2019-04-05 10:57:50 +02:00
Laurent Destailleur
8fe1be1a67 Removed deprecated use of string in dol_print_date(). Only date allowed. 2019-04-01 19:27:34 +02:00
Laurent Destailleur
d572a9258c
Merge branch 'develop' into new_evol_time_spent_views 2019-03-31 19:12:27 +02:00
Laurent Destailleur
26e3f41f73 Translation 2019-03-29 16:18:47 +01:00
atm-ph
fa41eeec7f New evol "Input per week" display 2019-03-21 14:21:29 +01:00
Laurent Destailleur
d44be341a5 NEW Add property 'noteditable' in modulebuilder 2019-03-17 01:45:46 +01:00
Laurent Destailleur
a2d6723ff3 WIP Link files to expense report lines 2019-03-15 15:07:52 +01:00
Laurent Destailleur
8f65ee2296
Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode 2019-03-14 17:48:44 +01:00
Laurent Destailleur
fe6b682ec0 NEW Add visibility with value 4 in framework to define fields to show on 
forms and list but not on creation forms.
 2019-03-12 17:45:19 +01:00
Laurent Destailleur
ddc52b7199 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/exports/export.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2019-03-07 14:13:38 +01:00
Laurent Destailleur
02b8bc94e7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-07 14:06:31 +01:00
Laurent Destailleur
0349f9bfaa
Update objectline_create.tpl.php 2019-03-07 13:26:25 +01:00
Christophe Battarel
96b8da0d62 fix supllier discount 2019-03-06 22:04:01 +01:00
Laurent Destailleur
1ab3949e9c Optimize js code 2019-03-06 13:01:01 +01:00
Laurent Destailleur
7d37b4c46d CSS 2019-03-05 13:04:54 +01:00
Frédéric FRANCE
b5def5fd59
Update admin_extrafields_view.tpl.php 2019-03-02 18:11:47 +01:00
atm-quentin
e39f85ac4d FIX js focusing 2019-02-27 09:23:39 +01:00
atm-quentin
72dc25552a FIX better placement 2019-02-27 09:23:31 +01:00
Laurent Destailleur
014c199173 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/extrafields_list_print_fields.tpl.php
 2019-02-27 01:28:12 +01:00
atm-quentin
35762c0d4e add data elem on task list 2019-02-26 11:25:40 +01:00
Frédéric FRANCE
51b29f2ed5
replace html code by html5 in tpl 2019-02-23 22:43:53 +01:00
Frédéric FRANCE
0255336549
fix html5 user 2019-02-16 10:29:15 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Laurent Destailleur
38d4284638 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/db/pgsql.class.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/filefunc.inc.php
	htdocs/imports/import.php
	htdocs/supplier_proposal/card.php
 2019-02-08 11:26:08 +01:00
Laurent Destailleur
fe1188c4ea Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/filefunc.inc.php
 2019-02-08 10:44:45 +01:00
Laurent Destailleur
679a13e48c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
 2019-02-08 10:22:36 +01:00
Marc de Lima Lucio
428efa9227 FIX: line edit template: keep fk_parent_line 2019-02-05 12:02:49 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
Laurent Destailleur
9f7dfe2921
Merge pull request #10481 from frederic34/psr2forloop 
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
 2019-02-03 19:11:07 +01:00
Frédéric FRANCE
273d68381c
psr2 end file new line none found 2019-02-03 15:21:21 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
03701fa091
psr2 2019-02-02 18:25:01 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
Laurent Destailleur
a0c0b377b2 css 2019-01-31 20:53:47 +01:00
Frédéric FRANCE
b766204690
wip 2019-01-30 22:53:47 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Laurent Destailleur
408609e0ec Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/tpl/objectline_edit.tpl.php
 2019-01-30 16:54:38 +01:00