Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
71,061 Commits 36 Branches 189 Tags
01e7b5747d3ece7bb4623c8889ffa98ebb39bc7c
Commit Graph

71061 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
1e58b837f0 css 2018-10-13 14:11:44 +02:00
Laurent Destailleur
8a928a72fa Sync transifex 2018-10-13 14:03:32 +02:00
Philippe GRAND
56f5aaf1ad html5 2018-10-13 13:56:23 +02:00
Philippe GRAND
19ff02646e Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-13 13:47:35 +02:00
Laurent Destailleur
31152e10f6 Trans 2018-10-13 13:27:59 +02:00
Philippe GRAND
effd11e1f9 translation 2018-10-13 12:42:01 +02:00
Philippe GRAND
94ea438881 Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-13 12:40:28 +02:00
Laurent Destailleur
76e6968a21 Merge pull request #9730 from atm-ph/fix_7.0_extrafield_date_not_show 
Fix extrafield contact typed as date isn't show in the list from 'con…
 2018-10-13 12:03:07 +02:00
Laurent Destailleur
72381d3697 Merge pull request #9734 from frederic34/patch-9 
remove var_dump
 2018-10-13 12:01:27 +02:00
Laurent Destailleur
e5cc4ae61b Code comment 2018-10-13 12:00:59 +02:00
Philippe GRAND
30630ff368 fix typo 2018-10-13 11:58:19 +02:00
Philippe GRAND
1e0cf8dc8a fix typo 2018-10-13 11:42:29 +02:00
Philippe GRAND
a48554e875 fix typo 2018-10-13 11:19:41 +02:00
Philippe GRAND
e71a738209 fix typo and update resource url 2018-10-13 11:08:58 +02:00
Philippe GRAND
653589cc67 update resource url 2018-10-13 11:07:04 +02:00
Philippe GRAND
f8fbb976f6 fix typo and update resource url 2018-10-13 11:06:13 +02:00
Philippe GRAND
ec12a0d456 update resources url 2018-10-13 11:03:05 +02:00
Philippe GRAND
d98ebbd9ee Standardize and update code 2018-10-13 10:39:27 +02:00
Philippe GRAND
9551cb12f5 Standardize and update code 2018-10-13 09:59:33 +02:00
Philippe GRAND
d8b62f0808 Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-13 09:49:23 +02:00
atm-ph
7b17b453bf Fix sort and switch page 2018-10-12 23:29:35 +02:00
atm-ph
23e4cd57f3 Fix warnings PHP7 2018-10-12 23:27:38 +02:00
Frédéric FRANCE
0f8ac57c85 remove var_dump 2018-10-12 22:34:23 +02:00
atm-ph
e2748953c3 Fix print extrafield date in list 2018-10-12 22:31:47 +02:00
Laurent Destailleur
87f744896d Merge pull request #9733 from ATM-Marc/FIX_6.0_propal_customcode 
FIX: propal pdf: missing parenthesis for customs code
 2018-10-12 21:14:40 +02:00
Laurent Destailleur
b78932b9f7 Prepare 7.0.5 2018-10-12 21:11:40 +02:00
Laurent Destailleur
1e635cff1b Fix new stripe API 2018-10-12 21:00:33 +02:00
Laurent Destailleur
2bbf9a3429 Hide feature that need re-engeneering 2018-10-12 20:37:59 +02:00
Laurent Destailleur
d8edb1f6b8 Fix regression in online payment 2018-10-12 20:28:26 +02:00
Laurent Destailleur
83642ffa4d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-12 20:19:51 +02:00
Philippe GRAND
bdb09a7f43 Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-12 19:26:00 +02:00
Laurent Destailleur
6a363fd1ab API Stripe 2018-09-24 2018-10-12 19:26:00 +02:00
Laurent Destailleur
88d32899ce Merge pull request #9318 from ptibogxiv/patch-40 
Fix for new stripe API 2018-09-24
 2018-10-12 19:16:07 +02:00
Laurent Destailleur
f332dc1cef Merge branch 'develop' into patch-40 2018-10-12 19:15:43 +02:00
Laurent Destailleur
0f3ac26006 Merge pull request #9319 from ptibogxiv/patch-41 
Fix for new stripe API 2018-09-24
 2018-10-12 19:14:58 +02:00
Laurent Destailleur
afa45cd28e Merge pull request #9320 from ptibogxiv/patch-42 
Update Stripe API version
 2018-10-12 19:14:22 +02:00
Laurent Destailleur
bd60fe6ffd Prepare 7.0.4 7.0.4 2018-10-12 19:13:11 +02:00
Philippe Grand
7e82e3d44c Update card.php 2018-10-12 19:13:07 +02:00
Laurent Destailleur
bb606df5e0 Prepare 7.0.4 2018-10-12 19:12:20 +02:00
Laurent Destailleur
067b29c9f8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-12 19:09:45 +02:00
Laurent Destailleur
9f27dd41e5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
 2018-10-12 19:08:06 +02:00
Philippe GRAND
9e494e65e0 Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-12 19:04:02 +02:00
Laurent Destailleur
d4b02c0552 Release 6.0.8 2018-10-12 19:03:03 +02:00
Laurent Destailleur
2d2b9a030c Fix app name to match Stripe advice 2018-10-12 19:01:01 +02:00
Laurent Destailleur
60a5444c14 Fix app name to match Stripe advice 2018-10-12 18:50:33 +02:00
Marc de Lima Lucio
afd9b4ea1a FIX: propal pdf: missing parenthesis for customs code 2018-10-12 18:19:17 +02:00
Laurent Destailleur
fd46ae13d6 Merge pull request #9731 from atm-ph/fix_7.0_empty_column_physical_stock 
Fix display 0 (as virtual stock) instead of empty string
 2018-10-12 18:17:04 +02:00
Laurent Destailleur
ef820e4c55 Merge pull request #9726 from fgarcia78/develop 
FIX translatable field name in stock movement table
 2018-10-12 17:52:52 +02:00
Laurent Destailleur
a2aa491c51 Merge pull request #9728 from atm-john/8.0_Fix_count_error 
Fix count on no countable object
 2018-10-12 17:52:30 +02:00
Laurent Destailleur
1ab6cd4b59 Update card.php 2018-10-12 17:51:32 +02:00