Commit Graph

67751 Commits

Author SHA1 Message Date
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
Laurent Destailleur
edd2e12b8d css 2018-06-30 14:35:33 +02:00
Laurent Destailleur
982a1ffbaf NEW Automatic position of scroll when creating an extrafield 2018-06-30 14:22:05 +02:00
Regis Houssin
f3d213bab8 Fix: remove old code 2018-06-30 11:05:13 +02:00
Regis Houssin
debec3d175 Fix: remove old code of canvas
Conflicts:
	htdocs/product/list.php
2018-06-30 11:03:02 +02:00
Regis Houssin
62a55e10b7 Fix: remove not used list template 2018-06-30 10:58:28 +02:00
Regis Houssin
718cbce8eb Fix: use "visible" field name instead "checked" 2018-06-30 10:58:08 +02:00
Regis Houssin
96faf7cb0f Fix: use the new title 2018-06-30 10:55:15 +02:00
Regis Houssin
5b491a4d57 Fix: remove duplicate code 2018-06-30 10:55:01 +02:00
Regis Houssin
ebfd1846a3 Fix: add new field "checked" 2018-06-30 10:54:46 +02:00
Regis Houssin
4c90ff9917 NEW add "checked" field for new list engine compatibility 2018-06-30 10:54:22 +02:00
Regis Houssin
3a26443546 Fix: remove unused code
Conflicts:
	htdocs/product/list.php
2018-06-30 10:53:40 +02:00
Regis Houssin
e392610f46 Fix: missing banner 2018-06-30 10:52:51 +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
e01d748527 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-30 02:05:13 +02:00
Laurent Destailleur
16b4d2aee7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-06-30 02:04:24 +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
400d400b32 Fix bad constructor 2018-06-30 01:59:54 +02:00
Laurent Destailleur
71b2785afa
Merge pull request #8744 from wdammak/patch-4
Prepare report generation for the warehouse module
2018-06-30 01:48:15 +02:00
Laurent Destailleur
d5aae0ff9c
Merge branch '8.0' into patch-4 2018-06-30 01:47:24 +02:00
Laurent Destailleur
8d3fff5568
Merge pull request #8738 from atm-quentin/NEW_triggers_commercial_add
NEW triggers add commercial and del commercial
2018-06-30 01:44:10 +02:00
Laurent Destailleur
0f62408700 Remove duplicated code 2018-06-30 01:34:51 +02:00
Laurent Destailleur
31396739f9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-30 01:26:59 +02:00
Laurent Destailleur
7fab2ca1f8 Add new field 2018-06-30 01:26:33 +02:00
Laurent Destailleur
1ff8788ff7
Merge pull request #9016 from yolocodefrench/develop
ajout de la gestion des comptes bancaires des tiers via l'api
2018-06-30 01:26:08 +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
15cc90a66b
Merge pull request #8785 from defrance/patch-115
Add dateemploymentEnd on user
2018-06-30 01:22:06 +02:00
Laurent Destailleur
a9e78f27d9
Merge branch 'develop' into patch-115 2018-06-30 01:21:58 +02:00
Laurent Destailleur
202ab93c5f
Update 7.0.0-8.0.0.sql 2018-06-30 01:20:57 +02:00
Laurent Destailleur
7984316142
Update 7.0.0-8.0.0.sql 2018-06-30 01:20:44 +02:00
Laurent Destailleur
f9b46ee0fa
Merge pull request #8818 from wdammak/patch-6
NEW Add link to inventory code
2018-06-30 01:19:50 +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
fba9caab5d
Merge pull request #8944 from bafbes/abb7008
New: Option to see line numbers in modules page
2018-06-29 20:05:19 +02:00
Laurent Destailleur
75e9f1bf9a
Update modules.php 2018-06-29 20:05:12 +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
a850e91bcb
Merge pull request #9017 from grandoc/new_branch_27_06_2018
clean and update code
2018-06-29 19:41:22 +02:00
Laurent Destailleur
eb71810bdc
Merge pull request #8999 from dolibarr95/patch-46
NEW Add supplier ref in item reception page
2018-06-29 19:18:20 +02:00
Laurent Destailleur
569291763f
Update dispatch.php 2018-06-29 19:17:44 +02:00
Laurent Destailleur
69e535cfc7 Trans 2018-06-29 12:47:06 +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
Laurent Destailleur
346bf7bdd6 Fix param dol_invisible_topmenu
Conflicts:
	htdocs/main.inc.php
2018-06-29 00:21:14 +02:00