Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
65,163 Commits 36 Branches 189 Tags
40d04482b030e4b697e23fcb51e37b00f7b2d47b
Commit Graph

65163 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
40d04482b0 Fix set time 2018-03-09 22:45:16 +01:00
Laurent Destailleur
4d885310c7 Merge pull request #8311 from inoveaconseil/patch-1 
Fix set time limit to 0
 2018-03-09 22:41:15 +01:00
Laurent Destailleur
b8e724a4d7 Merge pull request #8310 from atm-florian/7.0_fix_invoicelist 
fix add "late" invoice into "save last search/backtolist" feature
 2018-03-09 22:37:55 +01:00
Laurent Destailleur
d8d13a7348 Merge branch 'develop' into 7.0_fix_invoicelist 2018-03-09 22:37:20 +01:00
Laurent Destailleur
6ff3ac82c6 Merge pull request #8309 from ATM-Marc/NEW_syslog_file_autoclean 
NEW: syslog file autoclean
 2018-03-09 22:34:30 +01:00
Laurent Destailleur
d858426b7b Update modSyslog.class.php 2018-03-09 22:33:39 +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
Laurent Destailleur
18dc1768a4 Merge pull request #8304 from hregis/develop_dict 
Fix: use code instead id
 2018-03-09 19:43:56 +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
Regis Houssin
3eeeaf2d2d Fix: REST API must be enabled for all entities 2018-03-09 12:54:34 +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
Laurent Destailleur
b68b66edcb Fix phpcs 2018-03-08 23:16:55 +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
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
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
Laurent Destailleur
936aef70a1 Merge branch 'develop' into ptibogxiv-stripe 2018-03-08 16:29:27 +01:00
Laurent Destailleur
6d0c4deb6e Merge pull request #8295 from ATM-Marc/FIX_product_photo_ecm 
FIX: warning when adding ECM files using old photo path
 2018-03-08 16:24:42 +01:00
Laurent Destailleur
343ca1bc77 Merge pull request #8294 from hregis/7.0_bug5 
Fix: avoid conflict between invoice and invoicenumber sharings
 2018-03-08 16:24:05 +01:00
Laurent Destailleur
47b03068ac Merge pull request #8300 from hregis/develop_dict 
Fix: regression, restore primary key
 2018-03-08 16:22:23 +01:00
Laurent Destailleur
0b316c3980 Attach invoice on email subscription confirmation 2018-03-08 15:01:34 +01:00
Laurent Destailleur
7a7c4b8f14 Fix invalid url 2018-03-08 14:41:13 +01:00
Regis Houssin
73a63c1abc Fix: syntax error 2018-03-08 11:57:38 +01:00
Regis Houssin
861a831e24 Fix: debug 2018-03-08 11:53:46 +01:00
ptibogxiv
7774b49beb Fix paymentmodes.php 2018-03-08 10:03:36 +01:00
Regis Houssin
fd9c79fa7f Fix: use getEntity if no rowid to compare 2018-03-08 07:42:17 +01:00
Regis Houssin
93a9430e49 Fix: regression, restore primary key 2018-03-08 07:41:54 +01:00
ptibogxiv
e2bd0198d1 Fix class call 2018-03-08 02:26:57 +01:00
ptibogxiv
5c04c2886c Delete because replace by paymentmodes.php 2018-03-08 02:09:27 +01:00
ptibogxiv
c3e211f3f7 Delete gateway.php 2018-03-08 02:08:43 +01:00
ptibogxiv
197ce2fc3d Fix set default 2018-03-08 02:08:14 +01:00