Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-11 03:51:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,062 Commits 36 Branches 190 Tags
2c7029850aadb9106ee5341f11f079dda48c0fd6
Commit Graph

14378 Commits

Author SHA1 Message Date
Laurent Destailleur
e1e813b895 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-03 12:33:26 +02:00
Laurent Destailleur
12c43d7722 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-03 12:33:17 +02:00
Laurent Destailleur
cfb41d4329 FIX: If module workflow disabled, we must disable autoclassification too 2018-07-03 11:43:50 +02:00
Laurent Destailleur
7ef6b16d31 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/install/step1.php
 2018-07-03 10:04:25 +02:00
Laurent Destailleur
0138b0e0b7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2018-07-03 10:01:30 +02:00
Laurent Destailleur
e72107422b Merge pull request #9040 from defrance/patch-122 
add holliday_admin_prepare_head
 2018-07-02 16:18:25 +02:00
Laurent Destailleur
4e7f9b1b4d Merge pull request #9038 from hregis/8.0_multicompany 
Fix: possibility to overload permissions (multicompany sharing)
 2018-07-02 16:12:40 +02:00
Philippe GRAND
0aa58537bb update code comment 2018-07-02 15:07:00 +02:00
Philippe GRAND
74c45fa876 update code comment 2018-07-02 14:30:30 +02:00
Philippe GRAND
f43cce34c8 update code comment 2018-07-02 13:34:21 +02:00
Philippe GRAND
8497f56a04 update description code 2018-07-02 12:35:06 +02:00
Laurent Destailleur
9c5d34fc5f Fix translation 2018-07-02 12:26:32 +02:00
Laurent Destailleur
a2c89d8110 Fix page code in pdf 2018-07-02 12:25:09 +02:00
Laurent Destailleur
63f3143718 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-02 12:18:34 +02:00
Laurent Destailleur
dc69960b00 Code comment 2018-07-02 12:17:34 +02:00
Laurent Destailleur
7bf33b1bac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/hrm/index.php
	htdocs/install/mysql/tables/llx_website_account.key.sql
	htdocs/modulebuilder/template/myobject_card.php
 2018-07-02 12:16:51 +02:00
Laurent Destailleur
11021353da Fix text in payment area of crabe pdf 2018-07-02 11:33:33 +02:00
Regis Houssin
9709207a4f Fix: superadmin can show all users in master entity 2018-07-02 10:18:16 +02:00
Regis Houssin
df718cca5c Fix: better sql request with multicompany transverse mode 2018-07-02 10:09:56 +02:00
Laurent Destailleur
93184c5f66 Fix travis 2018-07-01 23:57:54 +02:00
Regis Houssin
233ad2945c Fix: missing hook parameter 2018-07-01 20:03:08 +02:00
Regis Houssin
f13dd9c9bd Fix: missing hook parameter 2018-07-01 18:22:18 +02:00
Regis Houssin
8f124efc15 Fix: wrong mysql resource name 2018-07-01 17:48:01 +02:00
BENKE Charlene
43c5d7abdc add holliday_admin_prepare_head 
sorry eldy i forget it
 2018-07-01 17:33:35 +02:00
Regis Houssin
05c666c18b Fix: use numbering model corresponding to the entity of the object 2018-07-01 17:06:19 +02:00
Regis Houssin
80adac12c0 Fix: use object entity ID instead current entity 2018-07-01 16:01:30 +02:00
Regis Houssin
df55bee8ae Fix: missing "$disableremove" global 2018-07-01 15:33:10 +02:00
Laurent Destailleur
e06eb9e2fc Fix phpcs 2018-06-30 18:38:23 +02:00
Laurent Destailleur
751ddb46d2 Update pdf_blochet.class.php 2018-06-30 18:31:32 +02:00
Laurent Destailleur
d8c7c61951 Merge branch '8.0_canvas' of https://github.com/hregis/dolibarr into 
hregis-8.0_canvas

# Conflicts:
#	htdocs/product/canvas/product/tpl/list.tpl.php
 2018-06-30 18:29:08 +02:00
Laurent Destailleur
ee2d543781 Merge pull request #8837 from delcroip/patch-modulebuilder-supportsellist 
NEW support selllist in the  module builder
 2018-06-30 15:33:17 +02:00
Philippe GRAND
640f7697e4 update code 2018-06-30 11:45:49 +02:00
Regis Houssin
62a55e10b7 Fix: remove not used list template 2018-06-30 10:58:28 +02:00
Regis Houssin
3a26443546 Fix: remove unused code 
Conflicts:
	htdocs/product/list.php
 2018-06-30 10:53:40 +02:00
Regis Houssin
f998f64db0 Works on use new list engine instead template for canvas 
Conflicts:
	htdocs/product/list.php
 2018-06-30 10:52:26 +02:00
Laurent Destailleur
df96c5ca81 Merge pull request #8796 from defrance/patch-113 
introduce serial and document for holiday module
 2018-06-30 02:09:28 +02:00
Laurent Destailleur
f6774de773 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-30 02:00:46 +02:00
Laurent Destailleur
c6b650a7bb Merge pull request #8789 from defrance/patch-116 
NEW Add CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY and CONTRACT_HIDE_UNSELECTABLES by SELECT_HIDE_UNSELECTABLES
 2018-06-30 01:23:09 +02:00
Laurent Destailleur
3112244529 Merge pull request #8884 from defrance/patch-117 
New : fichinter models (like factureRec)
 2018-06-30 01:19:03 +02:00
Laurent Destailleur
08175fffe6 Merge pull request #9028 from atm-ph/new_select_multiple 
New parameter to transform select into multiselect
 2018-06-30 01:18:20 +02:00
Laurent Destailleur
e4388e63fa Merge pull request #8891 from inoveaconseil/develop 
NEW: ADD url to see the last version of a external module
 2018-06-30 01:17:10 +02:00
Laurent Destailleur
b1d94af439 Merge pull request #8931 from ruistrecht-alt/MAIN_DOCUMENTS_DESCRIPTION_FIRST 
NEW Add hidden option MAIN_DOCUMENTS_DESCRIPTION_FIRST
 2018-06-29 20:04:24 +02:00
Laurent Destailleur
292d7967c3 Merge pull request #9021 from grandoc/8.0 
Fix : Notice: A non well formed numeric value encountered line 509
 2018-06-29 20:02:54 +02:00
Laurent Destailleur
9004a51880 Update conf.class.php 2018-06-29 20:02:40 +02:00
Laurent Destailleur
4ace9dd12d Merge pull request #9015 from hregis/8.0_bug 
Fix: remove unused and blocking field
 2018-06-29 19:58:25 +02:00
Laurent Destailleur
a011140243 Merge pull request #9025 from atm-quentin/FIX_missing_type_element 
Fix missing type element
 2018-06-29 19:57:16 +02:00
Laurent Destailleur
2175a012e1 Fix lang 2018-06-29 18:23:59 +02:00
Regis Houssin
2d13b5b59d Fix: broken feature with edit in place 2018-06-29 15:57:34 +02:00
atm-ph
41a516f1c4 New parameter to transform select into multiselect 2018-06-29 11:48:54 +02:00
Laurent Destailleur
20c72c1ae4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/main.inc.php
 2018-06-29 00:22:15 +02:00