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

65777 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Regis Houssin
2b8fe93fc8 Fix: remove unused global 2018-03-27 17:40:17 +02:00
Regis Houssin
35b6cb750f Fix: move "moreHtmlRef" hook in "showrefnav" function 2018-03-27 17:36:25 +02:00
Regis Houssin
180f2a0336 Fix: multi_dir compatibility 2018-03-25 12:56:43 +02:00
Regis Houssin
d5ed29c567 NEW add "moreHtmlRef" hook 2018-03-25 12:13:29 +02:00
Laurent Destailleur
a1b44651e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-24 18:28:23 +01:00
Laurent Destailleur
6ef1dbbe0f FIX auto open contract if one result found 2018-03-24 18:28:06 +01:00
Laurent Destailleur
0d563ad0ec
Merge pull request #8444 from hregis/develop_multicompany 
NEW add printUserListWhere hook
 2018-03-24 16:42:57 +01:00
Laurent Destailleur
0a2db0d745
Merge pull request #8446 from hregis/develop_dict 
Fix: Parameter must be an array or an object that implements Countable
 2018-03-24 16:41:04 +01:00
Laurent Destailleur
630ed04e17 FIX missing properties in last contract list 2018-03-24 13:15:00 +01:00
Laurent Destailleur
ab9edef3c7 Fix external links ko when substitution key are inside domain 2018-03-24 12:46:52 +01:00
Laurent Destailleur
f9ad2f7fb2 FIX Missing include 2018-03-24 12:10:04 +01:00
Laurent Destailleur
ab4f66009a Translation 2018-03-24 00:00:35 +01:00
Laurent Destailleur
c864dbd515 Save Stripe customer id when using online member subscription 2018-03-23 23:59:35 +01:00
Laurent Destailleur
c7e93a5a3b Serious enhancement in auto subscription for member module 2018-03-23 22:49:08 +01:00
Laurent Destailleur
53edb86ffb Make sending of email for member module ok with new email template archi 2018-03-23 19:35:25 +01:00
Laurent Destailleur
639d8ce9ef Fix link replacement 2018-03-23 18:11:01 +01:00
Laurent Destailleur
6e32e9961f Syn transifex 2018-03-23 17:56:35 +01:00
Laurent Destailleur
7363ae17ee Move setup of email for module module into email templates 2018-03-23 16:09:46 +01:00
Regis Houssin
47ea5a84fe Fix: wrong var name 2018-03-23 11:11:14 +01:00
Regis Houssin
2fb0fc39a5 Fix: Parameter must be an array or an object that implements Countable 2018-03-23 11:10:04 +01:00
Regis Houssin
f330c5ad32 Fix: better compatibility 2018-03-23 10:52:10 +01:00
Regis Houssin
715852569b NEW add printUserListWhere hook 2018-03-23 10:42:36 +01:00
Laurent Destailleur
171ad5dce2 Enhance code for template invoices 2018-03-22 21:42:19 +01:00
Laurent Destailleur
72cedcf9f3 Removed method fetch_prods() and get_each_prod() not used, keep only 
get_arbo_each_prod() that is better.
 2018-03-22 18:01:06 +01:00
Laurent Destailleur
d6f3fc9fe7 Fix use the getSalesRepresentative function instead of get_users 2018-03-22 16:05:50 +01:00
Laurent Destailleur
aa859f980d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-22 14:21:17 +01:00
Laurent Destailleur
87815265c8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-22 14:19:56 +01:00
Laurent Destailleur
a9944e1d23 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	ChangeLog
	htdocs/contrat/card.php
 2018-03-22 14:19:34 +01:00
Laurent Destailleur
5efb94b06f Prepare 5.0.6 2018-03-22 14:13:58 +01:00
Laurent Destailleur
ed2d9f179b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/contrat/card.php
 2018-03-22 14:12:37 +01:00
Laurent Destailleur
9980a5fbd0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2018-03-22 14:08:43 +01:00
Laurent Destailleur
86e496963b
Merge pull request #8081 from atm-maxime/new_salesrep 
NEW improve way of adding users/sales representative to thirdparty
 2018-03-22 14:05:44 +01:00
Laurent Destailleur
99d88b0fa9
Merge pull request #8435 from enstentechnologies/7.0 
FIX PropalStatusValidatedShort missing in langs/en_US/propal.lang
 2018-03-22 14:04:40 +01:00
Laurent Destailleur
0bb7d4d494
Update propal.lang 2018-03-22 14:04:33 +01:00
Laurent Destailleur
a7cb811b39
Merge pull request #8431 from fappels/7.0_fix_products_translation 
Fix products translation
 2018-03-22 13:51:37 +01:00
Laurent Destailleur
4c1dcc37d1 Fix packager 2018-03-22 13:38:28 +01:00
Laurent Destailleur
2ee0e68d67 Fic packaging tools 2018-03-22 13:22:33 +01:00
vabeltran
3793fd69e6 FIX PropalStatusValidatedShort missing in langs/en_US/propal.lang 
Added PropalStatusValidatedShort value, missing in lang/en_US/propal.lang file.
 2018-03-22 13:18:06 +01:00
Laurent Destailleur
658b145ff4 Missing translation 2018-03-22 13:16:38 +01:00
Laurent Destailleur
4eec7db731 Prepare 7.0.1 2018-03-22 13:13:04 +01:00
Laurent Destailleur
68a4058387 Fix translation 2018-03-22 13:03:12 +01:00
Laurent Destailleur
700c69e127 NEW Can set position of images in module tickets 
Mutualize code of method show_photo
 2018-03-22 11:46:35 +01:00
fappels
3765bc4775 Fix html escape for edit label 2018-03-22 10:48:03 +01:00
fappels
9e4a66b1a9 Fix hidden oprion PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION 2018-03-22 10:46:54 +01:00
Laurent Destailleur
6e52c896f2 Dolibarrize module ticket 2018-03-22 10:46:42 +01:00
Laurent Destailleur
3b55049895 Dolibarrize module ticket 2018-03-22 10:23:25 +01:00
Laurent Destailleur
227b830aa2 Fix visible rounding of abandonned amount 2018-03-22 09:41:30 +01:00
Laurent Destailleur
7b6104de38
Merge pull request #8427 from ATM-Consulting/develop_atm 
NEW: method Form::selectArrayFilter() + use in left menu search
 2018-03-21 20:44:44 +01:00
Laurent Destailleur
0cba7fc761
Update main.inc.php 2018-03-21 20:44:32 +01:00
Laurent Destailleur
a54316ef05
Update main.inc.php 2018-03-21 20:43:26 +01:00