Commit Graph

71061 Commits

Author SHA1 Message Date
Laurent Destailleur
e1e0001fda Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-05 09:56:00 +01:00
Laurent Destailleur
a9bbb82e98 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-05 09:55:12 +01:00
Laurent Destailleur
bf2c521988 Fix warning 2018-11-05 09:55:00 +01:00
Laurent Destailleur
1afdf7a961 Merge pull request #9947 from bafbes/abb80042
New : help picto for fields in creation
2018-11-05 09:54:42 +01:00
Laurent Destailleur
7c3cb7d73c Update commonfields_add.tpl.php 2018-11-05 09:54:11 +01:00
Laurent Destailleur
ccf6554f76 Merge pull request #9941 from ptibogxiv/patch-87
Fix various fix cmail, payout, const, connect
2018-11-05 09:38:41 +01:00
Laurent Destailleur
6fd76f5ffb Merge pull request #9939 from ptibogxiv/patch-86
Fix ext_payment_site
2018-11-05 09:37:45 +01:00
Laurent Destailleur
6b89bc4ecc Merge pull request #9937 from aspangaro/9.0_FEC
Debug asset module
2018-11-05 09:36:42 +01:00
Laurent Destailleur
8b373fb7a3 Merge pull request #9935 from atm-maxime/fix_socdelete_unlink_parent
Fix parent link was not removed on societe deletion #9106
2018-11-05 09:35:41 +01:00
Laurent Destailleur
ce25c6644f Merge pull request #9952 from andreubisquerra/master
No posibility to validate if invoice not exist
2018-11-05 09:27:12 +01:00
Laurent Destailleur
98a3af620b FIX #9934 2018-11-05 09:26:23 +01:00
Laurent Destailleur
02eaaaa53e Merge pull request #9934 from atm-maxime/fix_mandatory_tracking
Fix tracking field in dictionnary should not be mandatory #8919
2018-11-05 09:22:24 +01:00
Laurent Destailleur
4e0dbc1826 Merge pull request #9932 from grandoc/new_branch_01_11_2018
complete comment
2018-11-05 09:20:00 +01:00
Laurent Destailleur
58b7201529 Merge pull request #9931 from aspangaro/9.0_accountancy
Fix Specific finename for FEC export only available on general ledger export
2018-11-05 09:19:42 +01:00
Laurent Destailleur
234c35e940 Merge pull request #9930 from frederic34/fixphpcs
fix phpcs
2018-11-05 09:18:34 +01:00
Laurent Destailleur
d130e79384 Merge pull request #9936 from ptibogxiv/patch-84
Fix payout
2018-11-05 09:17:18 +01:00
Laurent Destailleur
63454c4e88 Merge pull request #9949 from frederic34/patch-15
typo
2018-11-05 09:16:55 +01:00
Laurent Destailleur
2312c02d12 Merge pull request #9944 from atm-maxime/fix_emailcollector_sql
fix minor SQL error
2018-11-05 09:16:20 +01:00
andreubisquerra
86b98db2a2 No posibility to validate if invoice not exist 2018-11-04 20:36:23 +01:00
Philippe GRAND
eb49558600 Clean and update code 2018-11-04 12:09:16 +01:00
Frédéric FRANCE
488ac8c8f0 Update index.php 2018-11-03 23:44:25 +01:00
Laurent Destailleur
90d3b80efb NEW Add email in event histor for reminder email of expired subsription 2018-11-03 22:53:55 +01:00
Frédéric FRANCE
c01113e28b typo 2018-11-03 22:49:30 +01:00
Laurent Destailleur
f4346c1469 Fix css 2018-11-03 19:24:28 +01:00
Laurent Destailleur
67fbb3dbb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/class/notify.class.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
2018-11-03 19:15:52 +01:00
Laurent Destailleur
c4bf0f0e03 CSS Flex 2018-11-03 18:57:18 +01:00
Frédéric FRANCE
d6b909a280 Update index.php 2018-11-03 18:26:11 +01:00
Frédéric FRANCE
8ab53012b7 mode is only customer in stats fichinter 2018-11-03 18:20:36 +01:00
Laurent Destailleur
68ec172798 Fix setup to enable reminder b email 2018-11-03 12:37:52 +01:00
Laurent Destailleur
7e55701774 2 remind of subscription expired by default 2018-11-03 11:41:45 +01:00
Laurent Destailleur
64b5e432c2 2 remind of expired subscription by default 2018-11-03 11:40:43 +01:00
Laurent Destailleur
0229b96178 Fix family of module 2018-11-03 11:38:29 +01:00
Laurent Destailleur
28d5f1d50b Fix sql syntax error 2018-11-03 11:30:32 +01:00
Abbes Bahfir
5f4d644cab New : help picto for fields in creation 2018-11-03 11:12:50 +01:00
ptibogxiv
171d36d4fc Update payment.php 2018-11-02 17:49:11 +01:00
ptibogxiv
ab53885ef8 Fix with new stripe payment function 2018-11-02 17:22:42 +01:00
Maxime Kohlhaas
1052cb0534 Also in install table 2018-11-02 16:04:49 +01:00
Maxime Kohlhaas
cb5988bf30 fix minor SQL error 2018-11-02 15:47:02 +01:00
ptibogxiv
d5a910841f Fix various fix cmail, payout, const, connect 2018-11-01 23:20:28 +01:00
ptibogxiv
b34f781686 Fix ext_payment_site 2018-11-01 23:04:10 +01:00
Alexandre SPANGARO
8d8023b405 Debug asset module 2018-11-01 22:32:33 +01:00
ptibogxiv
263e8ed4af Fix payout 2018-11-01 20:45:08 +01:00
Maxime Kohlhaas
29c0448a2e Fix parent link was not removed on societe deletion #9106 2018-11-01 15:41:58 +01:00
Maxime Kohlhaas
d1133916e0 Fix tracking field in dictionnary should not be mandatory 2018-11-01 15:33:14 +01:00
Laurent Destailleur
1140735554 Fix css 2018-11-01 15:20:05 +01:00
ptibogxiv
a46f29cb98 Update Stripe Version API
The description field on customer endpoints has a maximum character length limit of 350 now. The name field on product endpoints has a maximum character length limit of 250 now. The description field on invoice line items has a maximum character length limit of 500 now.
The billing_reason attribute of the invoice object now can take the value of subscription_create, indicating that it is the first invoice of a subscription. For older API versions, billing_reason=subscription_create is represented as subscription_update.
2018-11-01 12:02:36 +01:00
Philippe GRAND
b7f5e9e6c7 complete comment 2018-11-01 11:50:55 +01:00
Alexandre SPANGARO
af1305a0a8 Fix Specific finename for FEC export only available on general ledger export 2018-11-01 07:24:48 +01:00
Frédéric FRANCE
aa8236dd98 fix phpcs 2018-10-31 21:33:37 +01:00
Laurent Destailleur
970f501147 Debug modulebuilder 2018-10-31 20:10:20 +01:00