Commit Graph

68848 Commits

Author SHA1 Message Date
Laurent Destailleur
a7737cc436
Merge pull request #8332 from defrance/patch-105
primary key without space
2018-03-10 23:53:53 +01:00
Laurent Destailleur
0389664b1e Fix php code 2018-03-10 23:50:41 +01:00
Inovea Conseil
c2397fad60
Fix #8092 2018-03-10 23:49:43 +01:00
florian HENRY
3da645ab3b fix trigger position into explication class 2018-03-10 23:40:56 +01:00
Maxime Kohlhaas
c008853842 Fix #8057 2018-03-10 23:05:33 +01:00
BENKE Charlene
0d50cab97e
primary key without space 2018-03-10 23:05:24 +01:00
Laurent Destailleur
390618db47 Fix bad space 2018-03-10 22:42:28 +01:00
Laurent Destailleur
bdb6a09762 Fix phpcs 2018-03-10 22:41:57 +01:00
Laurent Destailleur
54d2e1f55d
Merge pull request #7970 from marcosgdf/bug-6980
FIX #6980 FormMail::getEmailTemplate returns an array instead of a ModelMail object
2018-03-10 22:27:32 +01:00
Laurent Destailleur
72bccd9c6b
Merge branch 'develop' into bug-6980 2018-03-10 22:27:07 +01:00
Laurent Destailleur
dfb3d1b3bc
Merge pull request #8325 from inoveaconseil/develop
Add execution date on direct debit
2018-03-10 22:11:58 +01:00
Laurent Destailleur
bb835d3633
Update bonprelevement.class.php 2018-03-10 22:09:32 +01:00
Laurent Destailleur
ce13fa56a2
Merge pull request #8302 from ptibogxiv/ptibogxiv-stripe
ADD IPN/webhook for stripe
2018-03-10 22:05:37 +01:00
Laurent Destailleur
3a8c216ab6
Merge branch 'develop' into ptibogxiv-stripe 2018-03-10 22:05:18 +01:00
Laurent Destailleur
8aec5cf6fa
Merge pull request #8331 from atm-alexis/NEW_hidden_conf_for_nb_weeks_to_swho
NEW hidden conf AGENDA_NB_WEEKS_IN_VIEW_PER_USER to set nb weeks to show into per user view
2018-03-10 21:55:58 +01:00
Laurent Destailleur
d10b7ef05a
Merge pull request #8330 from BadPixxel/7.0_Fix_Product_price_warning
Fix for PHP7.1: PHP Warning:  A non-numeric value in product.class.php
2018-03-10 21:53:48 +01:00
Laurent Destailleur
0b1b740a0e
Merge pull request #8329 from BadPixxel/7.0
BugFix Issue #8261: Variants module. Combinations cannot be edited
2018-03-10 21:53:12 +01:00
Laurent Destailleur
6c9e0e1752
Merge branch '7.0' into 7.0 2018-03-10 21:52:57 +01:00
Alexis Algoud
74dc815bfa fix commonobject isInt for module builder capabilities 2018-03-10 19:02:06 +01:00
Laurent Destailleur
72eff36cd6
Merge pull request #8328 from atm-alexis/FIX_commonObject_isInt_linked
Fix commonobject isInt for module builder capabilities
2018-03-10 18:59:12 +01:00
Laurent Destailleur
905cf112e9
Merge pull request #8327 from tiaris/fix7.0
FIX #8289
2018-03-10 18:58:22 +01:00
Laurent Destailleur
6fcc271790
Update product.class.php 2018-03-10 18:57:55 +01:00
Laurent Destailleur
f609547bc9
Update bonprelevement.class.php 2018-03-10 18:50:41 +01:00
Laurent Destailleur
9e0c74ca20
Update bonprelevement.class.php 2018-03-10 18:49:48 +01:00
Laurent Destailleur
b2677c35e2
Merge pull request #8317 from frederic34/swifmailer
Add dkim signing with Swiftmailer
2018-03-10 18:48:08 +01:00
Laurent Destailleur
aea3c164ba
Merge pull request #8178 from hregis/7.0_bug2
Fix: avoid Warning: A non-numeric value encountered
2018-03-10 18:47:11 +01:00
Laurent Destailleur
3911738b88 Fix vulnerability reported by DIGITEMIS CYBERSECURITY & PRIVACY 2018-03-10 18:40:45 +01:00
Laurent Destailleur
e3ace1f89f Fix morecss not provided 2018-03-10 18:17:54 +01:00
Laurent Destailleur
702c84a100 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-10 17:57:49 +01:00
Alexis Algoud
129c032118 NEW hidden conf to set nb weeks to show into user view 2018-03-10 16:46:57 +01:00
BadPixxel
ea3872b0cb BugFix for PHP7.1: PHP Warning: A non-numeric value encountered in /tmp/Dolibarr/htdocs/product/class/product.class.php on line 1709 2018-03-10 15:57:29 +01:00
Laurent Destailleur
241b5e9a93 FIX security report DIGITEMIS CYBERSECURITY & PRIVACY 2018-03-10 15:52:11 +01:00
BadPixxel
44d18027f2 BugFix for PHP7.1: PHP Warning: A non-numeric value encountered in /tmp/Dolibarr/htdocs/product/class/product.class.php on line 1709 2018-03-10 15:48:40 +01:00
Inovea Conseil
87b797bdec Fix unknow field 2018-03-10 15:06:02 +01:00
ptibogxiv
3ea6a9fa5f
Update stripe.php 2018-03-10 15:05:04 +01:00
BadPixxel
836054a8b3 BugFix Issue #8261: Variants module. Combinations cannot be edited 2018-03-10 14:51:24 +01:00
ptibogxiv
6b43477c39
Update stripe.php 2018-03-10 14:48:07 +01:00
ptibogxiv
5403e7a347
Update stripe.php 2018-03-10 14:46:37 +01:00
ptibogxiv
bbff580fb3
integration of fee's platform 2018-03-10 14:45:07 +01:00
ptibogxiv
dd15dc56dd
Update and fix
prepare integration for more callback support
2018-03-10 14:34:10 +01:00
jean
6793bfae3a FIX #8289 add a cofoiguration for correct stopck calculation 2018-03-10 14:17:52 +01:00
Alexis Algoud
b370a3096c fix commonobject isInt for module builder capabilities 2018-03-10 14:14:31 +01:00
Laurent Destailleur
faef7a2e0c
Merge pull request #8324 from atm-maxime/fix_unit_replen
Fix unit in replenish #7225
2018-03-10 12:58:16 +01:00
Laurent Destailleur
96aaeb2fd0
Merge pull request #8326 from atm-florian/dev_fixscrunitiz
fix scrunitizer
2018-03-10 12:57:51 +01:00
Laurent Destailleur
b0bd8cf910
Update facture.class.php 2018-03-10 12:56:19 +01:00
Laurent Destailleur
a85a103a55
Merge pull request #8308 from atm-florian/7.0_fixinventory
7.0 fixinventory
2018-03-10 12:54:36 +01:00
Laurent Destailleur
212536a3fd
Update list.php 2018-03-10 12:54:20 +01:00
Laurent Destailleur
64f2f324de
Update card.php 2018-03-10 12:52:09 +01:00
Laurent Destailleur
a7f82af352
Update card.php 2018-03-10 12:49:25 +01:00
Laurent Destailleur
f6918a5d88 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-10 12:47:00 +01:00