lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
77,540 Commits 43 Branches 150 Tags 886 MiB
3d8f6dca76
Commit Graph

77540 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
3d8f6dca76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 16:30:32 +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
d7a41c6b72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-08-01 12:54:27 +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
Laurent Destailleur
814c405021 Add link to retry payment if error 2019-08-01 03:54:54 +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
a7390e7e47
Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop 
NEW Management of retained warranty on situation invoices
 2019-07-30 21:53:09 +02:00
Laurent Destailleur
9a60fac9d1
Merge pull request #11564 from simnandez/develop 
NEW: Add hidden option for update supplier buying in receptions
 2019-07-30 21:43:03 +02:00
Laurent Destailleur
aba9eafeea
Update dispatch.php 2019-07-30 21:42:53 +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
cd07596b27
Merge pull request #11565 from ptibogxiv/patch-199 
Fix application_fee name stripe.class.php
 2019-07-30 21:34:19 +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
4bda18fd4d
Merge pull request #11568 from joseplluis/patch-7 
FIX: move doActions hook before standard actions
 2019-07-30 21:08:12 +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
dca775985f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-30 20:55:41 +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
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
Laurent Destailleur
2a447fad1d
Merge pull request #11574 from Vaadasch/patch-1 
FIX Change "DOCUMENT_URI" to "PHP_SELF"
 2019-07-30 19:39:59 +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
1fc4db28c6
Merge pull request #11577 from Vaadasch/patch-2 
Change 0 and 1 to FALSE and TRUE for pgsql
 2019-07-30 19:34:34 +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
5cbde99871
Merge pull request #11579 from atm-maxime/new_withdraw_date_rum 
NEW Can edit date or RUM mandate
 2019-07-30 16:04:57 +02:00
Laurent Destailleur
a7a2e483c9
Update paymentmodes.php 2019-07-30 16:01:26 +02:00