Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-22 09:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,480 Commits 36 Branches 190 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

72480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Laurent Destailleur
8c843fdccd Merge pull request #9727 from atm-john/fix_situation_prev_percent 
FIX situation prev percent
 2018-10-12 17:49:24 +02:00
Laurent Destailleur
062d8a4bdb Merge pull request #9724 from Librethic/fix_position_email_template 
FIX : position 0 for emails templates
 2018-10-12 17:48:52 +02:00
Laurent Destailleur
f4b15612fc Merge pull request #9723 from atm-greg/New_save_documents 
NEW save archive of full documents directory
 2018-10-12 17:47:50 +02:00
Laurent Destailleur
2fdc1a9883 Merge pull request #9718 from frederic34/patch-9 
define $code for all execution paths
6.0.8 		2018-10-12 17:42:07 +02:00
Laurent Destailleur
f94628f43c Merge pull request #9717 from bafbes/abb80033 
Fix: Undeclared global variable
 2018-10-12 17:41:45 +02:00
Laurent Destailleur
817920f282 Prepare 6.0.8 2018-10-12 17:36:49 +02:00
Laurent Destailleur
99fde00902 Merge pull request #9719 from frederic34/patch-11 
do not trim int
 2018-10-12 17:35:04 +02:00
Philippe GRAND
18b3238bad Standardize and update code 2018-10-12 16:56:01 +02:00
Philippe GRAND
1cfb06934c Standardize and update code 2018-10-12 16:49:53 +02:00
Philippe GRAND
bd426d1052 Standardize and update code 2018-10-12 16:44:25 +02:00
Philippe GRAND
4df574d58e Standardize and update code 2018-10-12 16:23:27 +02:00
Philippe GRAND
c5edb3289b Standardize and update code 2018-10-12 16:09:05 +02:00
Philippe GRAND
181c1e0b77 Standardize and update code 2018-10-12 16:01:27 +02:00
Philippe GRAND
63ceb3fdd0 Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-12 16:00:34 +02:00
Laurent Destailleur
4000845970 Update screenshot 2018-10-12 15:57:38 +02:00
Philippe GRAND
9d4f6dc444 Standardize and update code 2018-10-12 15:55:36 +02:00
Philippe GRAND
ba40ad4aab Standardize and update code 2018-10-12 12:23:45 +02:00
Philippe GRAND
b4e2542472 Standardize and update code 2018-10-12 12:20:05 +02:00
Philippe GRAND
995e9b4f55 Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-12 12:16:57 +02:00
Laurent Destailleur
53b099858f FIX cutomer or supplier categories visible or not when required 2018-10-12 12:04:04 +02:00
Laurent Destailleur
82c89f739d social network module 2018-10-12 11:29:47 +02:00
Laurent Destailleur
cb53e18aa4 Social network module 2018-10-12 11:19:18 +02:00
Laurent Destailleur
ded5c4c3dd Social network module 2018-10-12 11:02:03 +02:00
Philippe GRAND
7e6cdfb5ec Standardize and update code 2018-10-12 09:34:54 +02:00
Philippe GRAND
357173f0ef Standardize and update code 2018-10-12 09:30:53 +02:00
Philippe GRAND
849a1a9400 Standardize and update code 2018-10-12 09:26:58 +02:00
atm-ph
79420593f4 Fix display 0 (as virtual stock) instead of empty string 2018-10-11 17:14:22 +02:00
Juanjo Menent
0976616401 Fix: Opening brace should be on a new line 2018-10-11 17:13:39 +02:00
Juanjo Menent
ab55ff2e2c New: works with variants: 
- Make the checkbox working correctly
 2018-10-11 15:44:23 +02:00
atm-ph
4b32c8e100 Fix extrafield contact typed as date isn't show in the list from 'contact/address' tab of company 2018-10-11 14:24:55 +02:00
Laurent Destailleur
e6f179b6cb Fix look 2018-10-11 13:33:44 +02:00
Laurent Destailleur
88ff7241f5 FIX Quick hack to solve pb of bad definition of public holidays 2018-10-11 13:12:36 +02:00
Juanjo Menent
58be4ac7a3 New: works with variants: 
- Hide child products into list if PRODUIT_ATTRIBUTES_HIDECHILD is activated
 2018-10-11 12:36:10 +02:00