Commit Graph

67869 Commits

Author SHA1 Message Date
Laurent Destailleur
8a6c27379f
Merge pull request #11737 from ptibogxiv/patch-237
Fix lang in takepos
2019-08-26 16:27:50 +02:00
Laurent Destailleur
6771a2e1f9
Update invoice.php 2019-08-26 16:27:00 +02:00
Laurent Destailleur
b21818a510
Merge pull request #11753 from aspangaro/10.0_p7
FIX Missing div for buttons in tax, loan, various payment modules
2019-08-26 16:24:10 +02:00
Laurent Destailleur
d08ed9fbcf FIX column jabberid missing 2019-08-26 16:19:39 +02:00
Laurent Destailleur
9e7796d495 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-26 16:09:57 +02:00
Laurent Destailleur
0c8640bfd9 FIX #11752 2019-08-26 16:09:20 +02:00
Laurent Destailleur
56ee89c38d
Merge pull request #11742 from ptibogxiv/patch-242
Fix lang in societe/list.php
2019-08-26 16:02:31 +02:00
Laurent Destailleur
7ebd79a45f
Update list.php 2019-08-26 16:02:24 +02:00
Alexandre SPANGARO
76691925a4 FIX Missing div for buttons in tax, loan, various payment modules 2019-08-26 15:35:20 +02:00
Alexandre SPANGARO
b00020c4ea FIX #11746 Unable to modify amount of insurance of a loan 2019-08-26 12:10:19 +02:00
Laurent Destailleur
60c3cefc53 FIX Api of documents work with value 'thirdparty' 2019-08-25 16:44:39 +02:00
ptibogxiv
dbcead47e1
Update list.php 2019-08-24 16:05:21 +02:00
ptibogxiv
7b5c9818f7
Fix context display with takepos societe/list.php 2019-08-24 15:58:33 +02:00
ptibogxiv
7112fcee9a
Update list.php 2019-08-24 15:54:14 +02:00
ptibogxiv
2be125e647
Fix display context for takepos in invoice list
fix for thirdparty name and create button
2019-08-24 15:47:17 +02:00
ptibogxiv
c4b18890d9
Update invoice.php 2019-08-24 15:12:56 +02:00
ptibogxiv
bb763ecb59
Fix lang in takepos 2019-08-24 14:02:25 +02:00
ptibogxiv
73a6b45e23
Fix load langs in takepos 2019-08-24 13:26:01 +02:00
Regis Houssin
064ab389ed FIX wrong parameters (same error in branch 9, 10, develop) 2019-08-24 12:44:23 +02:00
Laurent Destailleur
b7e7ca46b5 Fix responsive 2019-08-23 14:01:13 +02:00
atm-ph
f14f1c9190 Fix wrong placement to print title and missing hook to print value 2019-08-23 09:15:15 +02:00
ptibogxiv
839ba76ae4
Update stripetest_oauthcallback.php 2019-08-23 08:58:08 +02:00
Regis Houssin
2d59f6bb3d FIX avoid sql error if fk_project is empty during update 2019-08-23 07:59:36 +02:00
ptibogxiv
06fdd5ddbc
Update stripelive_oauthcallback.php 2019-08-22 22:50:41 +02:00
ptibogxiv
0be59646a8
Update stripelive_oauthcallback.php 2019-08-22 22:00:53 +02:00
Florian Mortgat
fa29415e6a Moved repair payload from a specific script to install/repair.php 2019-08-22 14:06:18 +02:00
Laurent Destailleur
2080f92ec2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-22 12:39:13 +02:00
Laurent Destailleur
27cd6cd308 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/compta/paiement.php
	htdocs/product/fournisseurs.php
	htdocs/stripe/payment.php
2019-08-22 12:39:07 +02:00
Laurent Destailleur
a35f010e55 FIX name and position of hook FIX #11710 2019-08-22 12:30:14 +02:00
Laurent Destailleur
f7391879a2
Merge pull request #11713 from ptibogxiv/patch-225
Fix context in takepos
2019-08-22 11:50:46 +02:00
Laurent Destailleur
cdda08c0d3 FIX #11685 2019-08-22 11:47:03 +02:00
Laurent Destailleur
923eb935eb
Revert "FIX for MAIN_MAXTABS_IN_CARD = $i card" 2019-08-22 11:28:49 +02:00
Laurent Destailleur
2bc0163354
Merge pull request #11685 from ptibogxiv/patch-224
FIX for MAIN_MAXTABS_IN_CARD = $i card
2019-08-22 11:25:08 +02:00
Laurent Destailleur
a19228ccc0 Fix compatibility with twofactor
Conflicts:
	htdocs/api/class/api_login.class.php
	htdocs/dav/fileserver.php
2019-08-22 10:53:42 +02:00
Laurent Destailleur
b06dab6930 Fix add option to restore backward compatibility 2019-08-22 00:44:28 +02:00
Laurent Destailleur
9bd229bc7a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/admin/modules.php
2019-08-21 16:04:34 +02:00
Laurent Destailleur
ed7480ddbb Fix phpcs 2019-08-21 16:03:49 +02:00
Laurent Destailleur
1b21905c55 Fix test on uploaded modules
Conflicts:
	htdocs/admin/modules.php
2019-08-21 14:53:58 +02:00
Laurent Destailleur
e75d7e4686 Fix test on uploaded modules 2019-08-21 14:51:48 +02:00
ptibogxiv
5613532b80
Fix context in takepos
need downgrade in v10 of this PR fo fix hiden context https://github.com/Dolibarr/dolibarr/pull/11629
2019-08-21 13:30:31 +02:00
Laurent Destailleur
f98d3c5c48 FIX Do not show tooltip if tooltip is empty 2019-08-20 14:08:30 +02:00
Laurent Destailleur
def0311f9d Fix translation 2019-08-19 17:26:13 +02:00
Laurent Destailleur
15a765a79a Fix responsive 2019-08-19 13:28:24 +02:00
Laurent Destailleur
21fc089f58 FIX Translation of month 2019-08-19 10:18:38 +02:00
Laurent Destailleur
18886c701d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/core/lib/company.lib.php
2019-08-19 00:02:26 +02:00
Laurent Destailleur
3a0057f6a3 FIX too many record in sql request. Whena criteria is a filter, we must
use an inner join.
2019-08-18 23:59:24 +02:00
Laurent Destailleur
71be9f5b3f Fix test on terminal for 'cashdesk' module 2019-08-18 21:01:17 +02:00
Laurent Destailleur
cef88283b3 Fix missing error message 2019-08-18 20:52:18 +02:00
Laurent Destailleur
783e01588c FIX It was possible to create cashfence without entering data. 2019-08-18 20:47:40 +02:00
andreubisquerra
bbc1dfb0f7 Cashcontrol TakePOS fixes 2019-08-18 20:40:31 +02:00
Laurent Destailleur
477384105f FIX missing test on permission on button to delete ledger record 2019-08-18 19:25:36 +02:00
Laurent Destailleur
d8d927547f Fix option ACCOUNTANCY_SHOW_EXPORT_FILES_MENU 2019-08-18 19:09:53 +02:00
Laurent Destailleur
ad5f2dbe9d Fix update on id 2019-08-18 18:56:58 +02:00
Laurent Destailleur
8cf0671804 FIX Missing transaction 2019-08-18 18:56:21 +02:00
Laurent Destailleur
2ddf7c1d1f Fix responsive 2019-08-18 17:03:20 +02:00
Laurent Destailleur
b1be6bf4f2 FIX #11422 Can't edit his own events with standard rights 2019-08-18 01:24:54 +02:00
Laurent Destailleur
18eb2a83fe FIX #11671 CVE-2019-15062 2019-08-17 22:17:27 +02:00
Laurent Destailleur
d21e557100 FIX #11671 CVE-2019-15062 2019-08-17 22:16:27 +02:00
Laurent Destailleur
898996da4a FIX vulenrability in uploading file found by 美创科技安全实验室 2019-08-16 21:45:13 +02:00
Laurent Destailleur
d51a651ab4 Fix phpcs 2019-08-16 17:35:12 +02:00
Laurent Destailleur
ee50c41e74 Fix phpcs 2019-08-16 17:34:23 +02:00
Laurent Destailleur
1e93d3d790 Prepare v10.0.2 2019-08-16 17:03:11 +02:00
Laurent Destailleur
b63c4b74b8 Code comment 2019-08-16 16:56:28 +02:00
Laurent Destailleur
9692ea5faf FIX #11671 CVE-2019-15062 2019-08-16 16:41:53 +02:00
Laurent Destailleur
b8406f842d
Merge pull request #10655 from atm-quentin/FIX_credit_note_used_on_list
Fix total on list and amount opened on thirdparty card (for supplier)
2019-08-15 21:14:03 +02:00
Laurent Destailleur
12e6dabc43 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-15 20:41:56 +02:00
Laurent Destailleur
64e52789d6 FIX #11591 FIX #11592 2019-08-15 20:39:47 +02:00
Laurent Destailleur
a8afb4549a
Merge pull request #11634 from fmarcet/9.0
FIX: Not showing MAIN_INVERT_SENDER_RECIPIENT when edit field
2019-08-15 20:22:27 +02:00
Laurent Destailleur
38fc05866d
Merge pull request #11619 from simnandez/10.0
Fix: allow access from any other class that inherits Form class.
2019-08-15 19:48:41 +02:00
Laurent Destailleur
ac8bf7b066
Update propal.class.php 2019-08-15 19:48:29 +02:00
Laurent Destailleur
c131af5ae1 FIX #11672 2019-08-15 19:16:52 +02:00
Laurent Destailleur
9cb5ba35dd
Merge pull request #11681 from hregis/10.0_mc
FIX duplicate css tag, decrease padding-bottom for boxes in eldy theme
2019-08-15 19:08:42 +02:00
Laurent Destailleur
4534826583
Merge pull request #11633 from fmarcet/10.0
FIX: Make protected all pfd models functions
2019-08-15 19:04:32 +02:00
Laurent Destailleur
12bebdefbb Fix can replace PclZip with ZipArchive 2019-08-14 04:07:25 +02:00
Laurent Destailleur
fbf6cbe091 FIX Option to use ZipArchive instead of PclZip bugged with large files. 2019-08-14 04:07:02 +02:00
Laurent Destailleur
4a20c99656 FIX Content send before header warning 2019-08-14 04:06:50 +02:00
Laurent Destailleur
6de2118f11 FIX Bad error management in zip compress and web site export
Conflicts:
	htdocs/website/index.php
2019-08-14 04:06:29 +02:00
Laurent Destailleur
e1ab5089d7 FIX Missing some replacements in website module
Conflicts:
	htdocs/website/index.php
2019-08-14 04:02:57 +02:00
ptibogxiv
93d64bb84e
Update functions.lib.php 2019-08-13 17:59:19 +02:00
ptibogxiv
8198276d64
FIX for MAIN_MAXTABS_IN_CARD = $i card 2019-08-13 17:47:30 +02:00
Laurent Destailleur
b443b1b372 FIX permission check on API intervention 2019-08-13 14:21:43 +02:00
Regis Houssin
34579dd4db FIX phpcs 2019-08-13 07:46:03 +02:00
Regis Houssin
056f51bfc5 FIX duplicate css tag, decrease padding-bottom for boxes in eldy theme 2019-08-13 07:14:42 +02:00
Laurent Destailleur
99473097a9 FIX Add log and type of content in dolWebsiteOutput and
dolWebsiteReplacementOfLinks

Conflicts:
	htdocs/website/index.php
2019-08-13 06:43:28 +02:00
Laurent Destailleur
52d34edb03 FIX USEDOLIBARREDITOR not always set 2019-08-13 05:23:10 +02:00
Laurent Destailleur
8e0a023270 FIX Disabling a website does not put it offline 2019-08-13 05:05:19 +02:00
Laurent Destailleur
77c96a49e1 Update website template 2019-08-13 04:53:47 +02:00
Laurent Destailleur
f4e58aab22 FIX Enable web site 2019-08-13 04:49:49 +02:00
Laurent Destailleur
ac57e527ce Fix translation 2019-08-12 19:01:23 +02:00
Laurent Destailleur
b3e9cf3be7 Sync transifex 2019-08-12 17:37:23 +02:00
Juanjo Menent
7dab396d08 Fix: error creating a budget from an intervention 2019-08-12 17:29:25 +02:00
Laurent Destailleur
5346135a0c Fix removed duplicate load 2019-08-12 17:12:57 +02:00
Laurent Destailleur
446f0590dc FIX VAT number for Monaco (it uses FR) 2019-08-12 13:45:04 +02:00
Ferran Marcet
f1c0442a77 FIX: Add comment before protected functions 2019-08-12 10:16:04 +02:00
Laurent Destailleur
00660d4885 Fix responsive 2019-08-12 02:52:36 +02:00
Laurent Destailleur
49e2f447a8 Fix responsive 2019-08-12 02:41:27 +02:00
Laurent Destailleur
5ca988b3d2 Fix position of requests 2019-08-12 02:36:15 +02:00
Laurent Destailleur
e21d6289ea FIX Can't add a new chart of account 2019-08-10 02:09:59 +02:00
Laurent Destailleur
9c92acadaa Fix lang 2019-08-10 01:51:50 +02:00
Laurent Destailleur
d0f1a23f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-10 01:44:08 +02:00
Laurent Destailleur
96fb4c52ea Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2019-08-10 01:43:52 +02:00
Laurent Destailleur
babeb52986
Merge pull request #11624 from ptibogxiv/patch-208
Fix update stripe api for more compliance to API
2019-08-10 01:39:31 +02:00
Laurent Destailleur
5dc2fd8ca0
Merge pull request #11621 from ptibogxiv/patch-205
Fix application_fee_amount
2019-08-10 01:38:30 +02:00
Laurent Destailleur
31fa26c2be Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-08-10 01:36:50 +02:00
Laurent Destailleur
0cb1210acc
Merge pull request #11622 from ptibogxiv/patch-206
Fix table in admin stripe.php
2019-08-10 01:33:57 +02:00
Laurent Destailleur
13a8ef8258
Merge pull request #11618 from ptibogxiv/patch-203
FIX author in message / ticket API
2019-08-10 01:33:21 +02:00
Laurent Destailleur
c647195689
Merge pull request #11632 from atm-greg/FIX_delivery_Extrafields
FIX delivery extrafields
2019-08-10 01:28:46 +02:00
Laurent Destailleur
76b0f42d4c
Merge pull request #11620 from ptibogxiv/patch-204
FIX document list for products in API
2019-08-10 01:27:52 +02:00
Laurent Destailleur
6089547e0e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-10 01:26:18 +02:00
Laurent Destailleur
46a5c05b75
Merge pull request #11623 from ptibogxiv/patch-207
FIX round for application fee in stripe
2019-08-10 01:25:07 +02:00
Laurent Destailleur
eea5ad9b81
Merge pull request #11627 from ptibogxiv/patch-209
FIX display payment intent in stripe's charge list
2019-08-10 01:23:06 +02:00
Laurent Destailleur
ab370137a8
Merge pull request #11628 from ptibogxiv/patch-210
FIX display only stripe sources for customer
2019-08-10 01:21:41 +02:00
Laurent Destailleur
2824dee11a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
2019-08-10 01:20:17 +02:00
Laurent Destailleur
049a08f435
Merge pull request #11631 from frederic34/patch-9
Update admin.lang
2019-08-10 01:15:28 +02:00
Laurent Destailleur
cee92356c6
Merge pull request #11644 from frederic34/patch-11
Update price_parser.class.php
2019-08-10 01:11:02 +02:00
Laurent Destailleur
6a8910f109
Merge pull request #11649 from ptibogxiv/patch-216
FIX qty in invoice list on product's stats
2019-08-10 00:37:35 +02:00
Je2fb
2dee289fc6 Update price_parser.class.php
Calculation with supplier_min_price work

Conflicts:
	htdocs/product/dynamic_price/class/price_parser.class.php
2019-08-10 00:21:13 +02:00
Laurent Destailleur
f752b96a7e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-10 00:14:27 +02:00
Abbes Bahfir
8f2786cf7b fix:this is not accessible in static context 2019-08-10 00:09:36 +02:00
Laurent Destailleur
88c66d24fe
Merge pull request #11662 from ptibogxiv/patch-219
FIX duration when creating service
2019-08-09 23:53:55 +02:00
Regis Houssin
0b831ccdf7 FIX better help message with multicompany 2019-08-09 09:33:14 +02:00
ptibogxiv
322ec32ff5
FIX duration when creating service 2019-08-07 20:16:53 +02:00
ptibogxiv
0fc92b92a2
Update facture.php 2019-08-06 16:47:54 +02:00
ptibogxiv
ee8d99351d
Update facture.php 2019-08-06 16:28:18 +02:00
Frédéric FRANCE
69985339d8
Update price_parser.class.php 2019-08-06 11:47:34 +02:00
ptibogxiv
05ac4eec52
Update charge.php 2019-08-06 00:16:18 +02:00
Frédéric FRANCE
7f23b77cbe
Update pdf_proforma.modules.php 2019-08-05 15:00:06 +02:00
Frédéric FRANCE
fde526f59d
Update pdf_einstein.modules.php 2019-08-05 14:58:50 +02:00
Ferran Marcet
32220dde2e FIX: Wrong variable. Must be PROJECT_HIDE_UNSELECTABLES 2019-08-05 14:12:19 +02:00
Ferran Marcet
cda8b15c7f FIX: Not showing MAIN_INVERT_SENDER_RECIPIENT when edit field 2019-08-05 14:00:15 +02:00
Ferran Marcet
fd1204bcd2 FIX: Make protected all pfd models functions 2019-08-05 13:41:25 +02:00
atm-greg
1d4fc32c20 fix second bad test 2019-08-05 13:13:56 +02:00
atm-greg
41c07b9b43 fix bad test in delivery card 2019-08-05 13:10:26 +02:00
Frédéric FRANCE
baa2e870d0
Update admin.lang
found in admin/company.php
2019-08-05 11:01:58 +02:00
Laurent Destailleur
d663657f15 FIX format of field with type timestamp 2019-08-04 13:06:48 +02:00
ptibogxiv
4633af3f5d
Update charge.php 2019-08-03 21:19:47 +02:00
ptibogxiv
4ed1ff5b9b
Fix display only stripe sources for customer 2019-08-03 21:17:12 +02:00
Laurent Destailleur
5339bb71ac FIX Fatal situation if payment removed on expense report. Action
set_unpaid was not available.
2019-08-03 20:57:21 +02:00
Laurent Destailleur
7f42380f83 FIX Fatal situation if payment removed on expense report. Action
set_unpaid was not available.
2019-08-03 20:53:57 +02:00
Laurent Destailleur
f210e286bd Fix balance of div 2019-08-03 20:53:28 +02:00
Laurent Destailleur
f3e38f4b09 FIX Fatal situation if payment removed on expense report. Action
set_unpaid was not available.
2019-08-03 20:53:18 +02:00
ptibogxiv
07cc21a113
Fix display payment intent in stripe's charge list 2019-08-03 20:35:53 +02:00
Laurent Destailleur
b40f2cbcce Fix responsive 2019-08-03 20:20:09 +02:00
Laurent Destailleur
83412e3c90 Fix warning 2019-08-03 16:38:57 +02:00
Laurent Destailleur
25ee539f92 FIX Missing where on entity
Conflicts:
	htdocs/core/class/commonobject.class.php
2019-08-03 16:35:15 +02:00
ptibogxiv
d30ce126e0
Fix update stripe api for more compliance to API 2019-08-03 13:00:52 +02:00
ptibogxiv
13eef54392
Fix round for application fee in stripe 2019-08-03 12:31:13 +02:00
Laurent Destailleur
55e9335cd2 Fix code comment 2019-08-02 19:26:04 +02:00
Laurent Destailleur
c34739ab3f Fix A file for a hidden feature provides a service without security
checks.
2019-08-02 19:25:50 +02:00
Laurent Destailleur
76b7aa2e0f Fix fields with visible = 3 must not be visible into list 2019-08-02 19:20:19 +02:00
Laurent Destailleur
55e8aca47e Fix skeleton of module 2019-08-02 19:06:40 +02:00
ptibogxiv
2d34a0c4c1
Fix table in admin stripe.php 2019-08-02 14:48:45 +02:00
ptibogxiv
3a0c1954d6
Fix application_fee_amount
need fix in v10 too
2019-08-02 13:23:15 +02:00
ptibogxiv
74e3a423fd
Fix document list for products in API 2019-08-02 12:35:00 +02:00
Juanjo Menent
03a2377abc Fix: allow access from any other class that inherits Form class. 2019-08-02 12:31:24 +02:00
Laurent Destailleur
c01ac05aec FIX Content of email for subscription 2019-08-02 12:04:06 +02:00
ptibogxiv
7a2e08a681
Fix author in message / ticket API 2019-08-02 11:41:40 +02:00
Laurent Destailleur
808d6ba389 Fix phpcs 2019-08-01 18:30:39 +02:00
Laurent Destailleur
cd0d5c41f5
Update interface_20_modWorkflow_WorkflowManager.class.php 2019-08-01 16:37:40 +02:00
Laurent Destailleur
5a719769bc Fix phpcs 2019-08-01 16:29:18 +02:00
Laurent Destailleur
6512435f9f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/modules/cheque/doc/pdf_blochet.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2019-08-01 16:27:55 +02:00
Laurent Destailleur
6693f9fbca Fix phpcs 2019-08-01 16:24:19 +02:00
Laurent Destailleur
bf14b4b3d5 Add Canada Dollar in currency that need symbol before 2019-08-01 16:20:18 +02:00
Laurent Destailleur
d6ae62478c FIX #10984 FIX reposition on "Build backup" button
FIX Fatal error on dol_htmloutput_mesg with corrupted array
2019-08-01 15:42:44 +02:00
Laurent Destailleur
90ddc0a214 FIX #10930 2019-08-01 14:27:57 +02:00
Laurent Destailleur
a260e7391f FIX for #11232 2019-08-01 14:24:54 +02:00
Laurent Destailleur
dfc2bebbb6 FIX #11400 2019-08-01 13:27:07 +02:00
Laurent Destailleur
d495f7969f FIX #11412 2019-08-01 13:11:20 +02:00
Laurent Destailleur
ac715b5147 Upgrade Stripe lib to 6.41 to support SetupIntent 2019-08-01 12:53:17 +02:00
Laurent Destailleur
8f2e781df6 FIX #11537 2019-08-01 12:42:12 +02:00
Laurent Destailleur
5022d83e2a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-01 12:41:02 +02:00
Laurent Destailleur
b8de18596a FIX #11543 2019-08-01 12:40:51 +02:00
Laurent Destailleur
73b72f5cd8
Merge pull request #11550 from hregis/10.0_ldap
FIX missing filter by current contact
2019-08-01 12:27:11 +02:00
Laurent Destailleur
5eb8f05061 FIX #11584 2019-08-01 12:23:02 +02:00
Laurent Destailleur
12b530c418 FIX Setup of TakePos was not possible after a clean install 2019-08-01 11:27:35 +02:00
atm-arnaud
f64092a1e8 FIX order or proposals billed if both workflow conf activated 2019-08-01 11:00:49 +02:00
Florian Mortgat
3ef257f4f2 Removed commented out code from the new migration script 2019-07-31 09:21:00 +02:00
Laurent Destailleur
9baf21f492 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-30 22:03:13 +02:00
Laurent Destailleur
754ed1b93b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2019-07-30 22:03:02 +02:00
Laurent Destailleur
6b789a13a1
Merge pull request #11562 from atm-quentin/FIX_pdf_cheque
FIX name was able to be in field but went back to new line
2019-07-30 22:00:58 +02:00
Laurent Destailleur
ed7a57e3ef
Merge pull request #11571 from atm-john/9.0_fix_showOutputField
Fix sellist showOuputField
2019-07-30 21:40:37 +02:00
Laurent Destailleur
9a87e27176
Merge pull request #11566 from atm-florianm/FIX_workflow_amount_comparison_fails_due_to_floating_point_val_precision_arithmetic_drift
FIX: floating point precision errors in the triggers of the workflow module
2019-07-30 21:23:43 +02:00
Laurent Destailleur
fe8ced58c8
Update interface_20_modWorkflow_WorkflowManager.class.php 2019-07-30 21:19:33 +02:00
Laurent Destailleur
64118a4ae3
Merge pull request #11573 from atm-maxime/8.0
Fix var declaration #11429
2019-07-30 20:56:23 +02:00
Laurent Destailleur
192fb45ce7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/adherents/card.php
	htdocs/compta/sociales/list.php
	htdocs/compta/sociales/payments.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/holiday/class/holiday.class.php
	htdocs/viewimage.php
2019-07-30 20:55:15 +02:00
Laurent Destailleur
cb07d80681 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-30 20:37:55 +02:00
Laurent Destailleur
5f2439bf0a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-30 20:37:44 +02:00
Laurent Destailleur
0ab16b739a Add more log and phpunit 2019-07-30 20:37:07 +02:00
Laurent Destailleur
9e622fe042
Merge pull request #11572 from atm-maxime/fix_holiday_update_solde
Fix holiday counter auto update
2019-07-30 20:12:30 +02:00
Laurent Destailleur
ea92ba2a78
Update holiday.class.php 2019-07-30 20:11:43 +02:00
Laurent Destailleur
00a4359508 FIX list of balance of leaves 2019-07-30 19:56:10 +02:00
Vaadasch
23bca6f4cd Change "DOCUMENT_URI" to "PHP_SELF"
DOCUMENT_URI works with Apache. To be compliant with Nginx and probably some others, use PHP_SELF
2019-07-30 19:40:28 +02:00
Vaadasch
1600ecc9ec Change 0 and 1 to FALSE and TRUE for pgsql
0 and 1 are read as False and True by Mysql, but not by PGsql.
FALSE and TRUE are correctly read by both => changing
2019-07-30 19:35:03 +02:00
Laurent Destailleur
e54c6fb5e2 FIX #11460 FIX #11492 FIX #11576 FIX #11590 2019-07-30 19:30:56 +02:00
Laurent Destailleur
d3b6411458 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-30 18:15:19 +02:00
Laurent Destailleur
a871aa818b FIX #11460 FIX #11492 FIX #11576 FIX #11590 2019-07-30 18:15:04 +02:00
Laurent Destailleur
a5e0dd56f4
Merge pull request #11580 from aspangaro/9.0_FEC
FIX FEC Format - Save translation of the journal label in database & nowrap on amount
2019-07-30 16:10:32 +02:00
Laurent Destailleur
78b92291a7
Merge pull request #11582 from aspangaro/10.0_adh
FIX Language key
2019-07-30 15:58:46 +02:00
Laurent Destailleur
941b2c5325
Merge pull request #11581 from aspangaro/9.0_adh
FIX Language key
2019-07-30 15:58:30 +02:00
Laurent Destailleur
c080878083
Merge pull request #11585 from ATM-Marc/FIX_9.0_expedition_printObjectLine_loop
FIX: expedition card: infinite loop for printObjectLine hook if return > 0
2019-07-30 15:58:09 +02:00