lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
65,913 Commits 43 Branches 150 Tags 886 MiB
28b00fc021
Commit Graph

65913 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maxime Kohlhaas
d82c62b638 Fix supplier order clone was keeping objectlinked 2018-03-09 21:51:59 +01:00
Laurent Destailleur
b5fd4c005c
Merge pull request #8307 from hregis/develop_api 
Fix: REST API must be enabled for all entities
 2018-03-09 21:26:44 +01:00
TuxGasy
9eeb80151e Fix bug when updating multi currency rate on invoice supplier 2018-03-09 21:13:54 +01:00
Laurent Destailleur
143827ac79
Merge pull request #8306 from Robisix/7.0 
FIX Duplicate product_type asignement on order addline
 2018-03-09 19:45:47 +01:00
Laurent Destailleur
8f7122cf52
Merge pull request #8305 from atm-florian/7.0_fix 
fix warning and sql error
 2018-03-09 19:44:57 +01:00
Laurent Destailleur
18dc1768a4
Merge pull request #8304 from hregis/develop_dict 
Fix: use code instead id
 2018-03-09 19:43:56 +01:00
florian HENRY
bb8525614c better fix 2018-03-09 19:37:39 +01:00
florian HENRY
42fed5981d bettre syntax 2018-03-09 19:16:06 +01:00
florian HENRY
02beed265e better space 2018-03-09 19:14:43 +01:00
florian HENRY
5a56e802d9 FIX #8232 2018-03-09 19:10:52 +01:00
Maxime Kohlhaas
4e222d3d92 Comment for travis 2018-03-09 19:09:16 +01:00
Maxime Kohlhaas
ded69bf57d New : link users to company like a tag 2018-03-09 18:59:06 +01:00
Inovea Conseil
d763bfcbf1
Fix set time limit to 0 
If the dolibarr was installed on a pc and not on server or in the doliwamp.
 2018-03-09 17:56:49 +01:00
florian HENRY
164ca682d5 fix add "late" invoice into "save last search/backtolist" feature 2018-03-09 17:23:43 +01:00
Marc de Lima Lucio
d6b4bc14e4 NEW: syslog file autoclean 2018-03-09 16:52:06 +01:00
ptibogxiv
bfa7478568
FIX compatibility for multicompany (stripeconnect or not) 
TODO: more test and create fee with stripe callback
 2018-03-09 14:40:20 +01:00
florian HENRY
f0164f2689 fix type date 2018-03-09 14:25:37 +01:00
florian HENRY
1c966d4769 on going 2018-03-09 12:57:58 +01:00
Regis Houssin
3eeeaf2d2d Fix: REST API must be enabled for all entities 2018-03-09 12:54:34 +01:00
Romain DELVAL
ee55776886 FIX Duplicate product_type asignement on order addline 
On addline order method, ther is a duplicate assignation on
line->product_type before call to "insert" method.
The second assignement always make product_type to "0" while it was
fetched from product himsel like it was made on first asignement few
lines above
 2018-03-09 12:38:28 +01:00
florian HENRY
f37d482331 fix warning and sql error 2018-03-09 11:37:23 +01:00
Regis Houssin
f4f81482e7 Fix: add todo if you use the good id by entities 2018-03-09 09:39:57 +01:00
Regis Houssin
ea175cd6c1 Fix: compatibility with multicompany dictionnary sharing 2018-03-09 09:37:23 +01:00
Regis Houssin
82057b3523 Fix: use code instead id 2018-03-09 08:11:02 +01:00
ptibogxiv
a2fd2bc3f3
FIX entity 
TO DO: save stripe account in multicompany mode and without stripe connect in theadmin of stripe module because stripe doesn't send custom field for all request
RISK: confusion and error in payment and transfert bank without this
 2018-03-09 00:03:44 +01:00
ptibogxiv
51398ad060
FIX dolibarr version 2018-03-08 23:27:20 +01:00
Laurent Destailleur
b68b66edcb Fix phpcs 2018-03-08 23:16:55 +01:00
ptibogxiv
3d411f09fc
Update actions_stripe.class.php 2018-03-08 23:13:37 +01:00
ptibogxiv
264112ab59
NEW actions on card.php for company and member 2018-03-08 23:07:58 +01:00
Laurent Destailleur
3ad95e46c0 Fix phpunit 2018-03-08 22:40:42 +01:00
Laurent Destailleur
9f42e1b172 Prepare code to introduce different payment modes than BAN 2018-03-08 22:33:40 +01:00
Laurent Destailleur
489dde4db4 Prepare database to store payment modes of customers 2018-03-08 22:26:42 +01:00
Laurent Destailleur
7a277a8d2b Debug list of charges. Compatible with the metadata FULLTAG used by 
dolibarr native online payment page.
 2018-03-08 21:32:52 +01:00
Laurent Destailleur
2cd0122d34 Fix phpcs 2018-03-08 20:59:23 +01:00
Laurent Destailleur
b7557db30a Merge 2018-03-08 20:53:44 +01:00
Laurent Destailleur
ad96229ec4 Fix not visible template selector for supplier order/invoice emails 
Conflicts:
	htdocs/fourn/facture/card.php
 2018-03-08 20:52:25 +01:00
Laurent Destailleur
e983e0709f Fix not visible template selector for supplier order/invoice emails 2018-03-08 20:49:37 +01:00
Laurent Destailleur
65aa5953f4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-08 20:36:07 +01:00
Laurent Destailleur
bf1bada435 Contact tab after main tab 2018-03-08 20:35:50 +01:00
ptibogxiv
432aa50812
Update ipn.php 2018-03-08 20:08:43 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm 
NEW: supplier credit notes & discounts (absolute and relative)
 2018-03-08 20:06:37 +01:00
ptibogxiv
415332c22a
ADD IPN/Webhook for stripe 
TODO: optimise code and uncustomize of ptibogxiv.net but good and fonctionnal for test
 2018-03-08 20:05:40 +01:00
Laurent Destailleur
e0af4f8489 Trans 2018-03-08 19:58:11 +01:00
Laurent Destailleur
b07fdafa65 Trans 2018-03-08 19:57:22 +01:00
Laurent Destailleur
235db1f405 Enhance OAuth module to store the stripe account in llx_oauth_token 2018-03-08 19:51:18 +01:00
Laurent Destailleur
88e47e11a4 Fix rename file 2018-03-08 17:44:51 +01:00
Laurent Destailleur
5b8006a6bb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/payment/paymentok.php
	htdocs/public/paypal/paymentok.php
 2018-03-08 16:37:17 +01:00
Laurent Destailleur
af9fff4f83 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-08 16:35:12 +01:00
Laurent Destailleur
3762ed12c7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2018-03-08 16:33:51 +01:00
Laurent Destailleur
8d56c9d374
Merge pull request #8297 from ptibogxiv/ptibogxiv-stripe 
ADD stripe.class.php and other fix/comment
 2018-03-08 16:29:34 +01:00