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

15416 Commits

Author SHA1 Message Date
Laurent Destailleur
9c45e86a1c Introduce main_doc into table of objects to know what is main doc. 
Work on option PROPOSAL_USE_ONLINE_SIGN
 2017-10-19 11:40:40 +02:00
gauthier
3793ae323a FIX : wrong personnal project time spent 2017-10-19 09:46:19 +02:00
Laurent Destailleur
cfeab01996 Prefill hour/min to 23:59 when creating a task 2017-10-18 18:50:30 +02:00
florian HENRY
63f3ac2f2b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_accountancy 2017-10-18 14:49:06 +02:00
Laurent Destailleur
69b131b919 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/societe/class/api_thirdparties.class.php
 2017-10-18 11:28:20 +02:00
Laurent Destailleur
d40dda83cf Add API "close" for proposals 
Standardize code
 2017-10-18 11:10:08 +02:00
florian HENRY
4273e507c5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 
dev_accountancy

Conflicts:
	htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
	htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
	htdocs/accountancy/class/lettering.class.php
 2017-10-18 09:52:56 +02:00
Laurent Destailleur
aa1ff189e1 Fix var not correctly initialized when using api + multicompany 2017-10-17 12:58:26 +02:00
Laurent Destailleur
8b140ab069 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-17 10:44:29 +02:00
Laurent Destailleur
eb1fdca157 NEW Can create intervention from a proposal 2017-10-17 10:44:18 +02:00
BackrndSource
df388df3ff Update html.form.class.php 
$lang->load('errors') is needed to load the traductions for:

$return.= '<font class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</div>';
$return.= '<font class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</div>';
 2017-10-16 22:56:16 +02:00
Laurent Destailleur
768c623a89 Merge pull request #7644 from atm-florian/dev_extrafield_default_value 
FIX : Extrafield default value admin/defaultvalues.php enabled
 2017-10-16 21:42:50 +02:00
florian HENRY
51ce8bf2a5 js 2017-10-16 21:08:09 +02:00
florian HENRY
17db813a4e Logical variable name suffix/prefix 2017-10-16 21:05:12 +02:00
Laurent Destailleur
b7c1b6b9d0 Merge pull request #7638 from hregis/develop_member 
New usage of attributes
 2017-10-16 21:03:30 +02:00
florian HENRY
695740142a FIX : Extrafield default value admin/defaultvalues.php enabled 2017-10-16 20:54:53 +02:00
Laurent Destailleur
ebe0664aff Merge branch 'develop' into scrutinizer-patch-3 2017-10-16 20:54:15 +02:00
Laurent Destailleur
41464bf5ac Merge pull request #7633 from defrance/patch-101 
template file not only odt/ods
 2017-10-16 20:25:20 +02:00
Laurent Destailleur
f7fe011e98 Add CRLF before 'boundary' word. Use \r\n on wordwrap. 2017-10-16 14:31:28 +02:00
Regis Houssin
46d9ef01c6 Fix: use new usage 2017-10-16 11:18:52 +02:00
Rui Strecht
447cc208fe Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 
# Conflicts:
#	htdocs/societe/class/societe.class.php
 2017-10-16 09:34:24 +01:00
Laurent Destailleur
87814af7b6 Move function colorIsLight into functions.lib.php 
Fix scrutinizer bugs.
 2017-10-16 09:29:10 +02:00
Laurent Destailleur
afdc176f47 Fix scrutinizer 2017-10-16 08:52:00 +02:00
Scrutinizer Auto-Fixer
bd5bffa72c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-16 06:47:05 +00:00
BENKE Charlene
c44207f7d3 template file not only odt/ods 2017-10-14 12:39:39 +02:00
Laurent Destailleur
e17c92b11c Code comment 2017-10-13 22:40:33 +02:00
Laurent Destailleur
ab280feaa5 Move datepicker vars into lib_heas.js.php 2017-10-13 22:37:46 +02:00
Laurent Destailleur
4296df45af Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/projet/list.php
	htdocs/user/card.php
 2017-10-13 22:01:56 +02:00
Laurent Destailleur
5092c41d94 Look and feel v6 2017-10-13 20:04:11 +02:00
Laurent Destailleur
8b64f979ef Fix multiple upload was broken 2017-10-13 15:49:39 +02:00
Laurent Destailleur
5f22afa450 Merge pull request #7621 from atm-ph/fix_distinct_credit_note 
Fix distinct credit note select list
 2017-10-13 13:32:04 +02:00
Scrutinizer Auto-Fixer
165741517e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-13 11:28:26 +00:00
Laurent Destailleur
d12019d1b5 Fix from scrutinizer 2017-10-13 13:10:36 +02:00
Laurent Destailleur
8113321062 Start to work on email sender profiles 2017-10-13 12:02:26 +02:00
Laurent Destailleur
0ac33d46c2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-13 10:35:38 +02:00
Laurent Destailleur
2b55fb81b9 Standardize substition keys. 2017-10-13 10:35:21 +02:00
atm-ph
bab43b043e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact 2017-10-13 09:52:56 +02:00
atm-ph
647c4036cf Fix simplification of code 2017-10-13 09:21:37 +02:00
Laurent Destailleur
558f261b60 FIX #7593 2017-10-13 01:03:33 +02:00
Laurent Destailleur
194fb2dbc8 Merge pull request #7615 from hregis/develop_extrafields 
NEW add translation column for extrafields list
 2017-10-13 00:47:45 +02:00
Laurent Destailleur
6497ca5394 prepare tzuserrel 2017-10-12 18:14:02 +02:00
Laurent Destailleur
50da6a0c9e Prepare code for removing adodb 2017-10-12 14:59:38 +02:00
Laurent Destailleur
3f36cf23f5 NEW Break lines per project on the new timesheet page 2017-10-12 13:17:22 +02:00
atm-ph
8d3df7ea57 Fix can not distinct which credit note are in select list 2017-10-12 09:59:25 +02:00
Laurent Destailleur
ca0af5cddf NEW Bulk action validate on customer invoices 2017-10-12 02:25:17 +02:00
Laurent Destailleur
5fd6a27c62 Fix position of top menu 2017-10-12 02:16:54 +02:00
Laurent Destailleur
0d0030cff4 Fix use of sender profiles 2017-10-11 19:57:53 +02:00
Laurent Destailleur
56be9e2b60 Introduce table c_email_senderprofile to have several profils 2017-10-11 19:41:45 +02:00
Laurent Destailleur
bcf56e3140 Introduce table c_email_senderprofile to have several profils 2017-10-11 19:41:19 +02:00
Regis Houssin
c9066afa36 NEW add translation column for extrafields list 2017-10-11 14:22:59 +02:00