Commit Graph

44425 Commits

Author SHA1 Message Date
Laurent Destailleur
a33d6c1d3c Prepare homepage to be a full personalized dashboard 2016-01-18 11:48:02 +01:00
Laurent Destailleur
6bccac5691 NEW Add Expense report to approve into workboard
NEW Selection of boxes is move on top
2016-01-18 11:35:45 +01:00
Laurent Destailleur
4b94c2ade7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-01-17 19:03:23 +01:00
Laurent Destailleur
2f3baca9b4 Fix bad translation 2016-01-17 19:03:12 +01:00
Laurent Destailleur
4a009d2ad2 NEW On translation admin page, admin can overwrite a translation value. 2016-01-16 00:48:14 +01:00
Laurent Destailleur
7f4c37da5f NEW Add state into list of fields available for personalized fields of
thirdparties
2016-01-15 23:48:06 +01:00
Laurent Destailleur
7f4386f739 Merge remote-tracking branch 'origin/3.9' into develop 2016-01-15 01:53:21 +01:00
Laurent Destailleur
0f97bca363 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-01-15 01:52:32 +01:00
Laurent Destailleur
cb24f2b372 Fix missing type in list 2016-01-15 01:52:16 +01:00
Laurent Destailleur
4d5845fce5 Prepare split of module supplier 2016-01-15 01:16:14 +01:00
Laurent Destailleur
6acd31f8ad Fix: style required in create or edit mode only 2016-01-15 00:44:38 +01:00
Laurent Destailleur
85898ec977 Fix bad test 2016-01-14 23:48:47 +01:00
Laurent Destailleur
e01d964652 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-01-14 23:46:30 +01:00
Laurent Destailleur
a0fc26fbd8 Fix missing orde by 2016-01-14 17:09:59 +01:00
Laurent Destailleur
524614ded9 Start to work on a per type view of agenda 2016-01-14 16:52:46 +01:00
Laurent Destailleur
b5f057051b Fix: Missing param into link 2016-01-14 15:45:05 +01:00
Laurent Destailleur
a6416b8797 Merge remote-tracking branch 'origin/3.9' into develop 2016-01-14 15:00:59 +01:00
Laurent Destailleur
0951042dad Fix: no need of translation tab if multilang was disabled. 2016-01-14 15:00:31 +01:00
Laurent Destailleur
acf3f23de8 Merge remote-tracking branch 'origin/3.9' into develop 2016-01-14 14:15:44 +01:00
Laurent Destailleur
b8b84c67a6 Fix bad setting of default actioncode 2016-01-14 14:15:14 +01:00
Laurent Destailleur
fef3bed4ba Fix bad name of var 2016-01-14 13:32:31 +01:00
Laurent Destailleur
7b14b5e115 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
2016-01-14 13:30:27 +01:00
Laurent Destailleur
23e90974c4 Prepare to split module supplier into supplier_order and
supplier_invoice
2016-01-14 13:24:49 +01:00
Laurent Destailleur
ef7061a575 Fix bad management of option SOCIETE_DISABLE_PROSPECTS and
SOCIETE_DISABLE_CUSTOMERS
2016-01-14 12:49:23 +01:00
Laurent Destailleur
23dd6b8388 Fix bad management of option SOCIETE_DISABLE_PROSPECTS and
SOCIETE_DISABLE_CUSTOMERS
2016-01-14 12:35:55 +01:00
Laurent Destailleur
ecb4661155 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-14 11:23:11 +01:00
Laurent Destailleur
63ebd40ceb Fix bad var value 2016-01-14 11:22:59 +01:00
Laurent Destailleur
89fad007b4 Fix constant() need the string name of a constant to return value of 2016-01-14 11:17:47 +01:00
Laurent Destailleur
7b4ebb498e Merge pull request #4415 from fappels/3.9-4409
Fix #4409 totals not shown in stock/list
2016-01-14 11:07:47 +01:00
Laurent Destailleur
a8148b8b40 FIX Bug: Delivery order and date are not displayed #4372 2016-01-13 20:56:20 +01:00
Laurent Destailleur
0f5e208127 Merge remote-tracking branch 'origin/3.9' into develop 2016-01-13 20:43:49 +01:00
Laurent Destailleur
13f10d55fc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-01-13 20:42:32 +01:00
Laurent Destailleur
55a056a449 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-13 20:41:47 +01:00
Laurent Destailleur
71b264dd86 FIX Bug: Delivery order and date are not displayed #4372
Link between shipment and delivery receipt was lost.
Status for receipt must not use same label than shipments.
2016-01-13 20:41:32 +01:00
fappels
f150676908 Fix #4409 totals not shown in stock/list 2016-01-13 16:33:51 +01:00
phf
a50a7366cb FIX travis test 2016-01-13 14:04:48 +01:00
Laurent Destailleur
2c24094d60 Fix bad tab on bad home area page 2016-01-13 13:54:11 +01:00
phf
d213fbae08 FIX invoice situation 2016-01-13 13:42:58 +01:00
Laurent Destailleur
9ba25be9bb Change category for application 2016-01-13 13:37:24 +01:00
Laurent Destailleur
f74dfe282b Fix missing default setup when module is enabled 2016-01-13 13:36:44 +01:00
Laurent Destailleur
d396612a7c NEW: Add a new method for margin calculation. Added margin on "cost
price" to margin on WAP price and margin on "best supplier price".
2016-01-13 12:48:59 +01:00
Laurent Destailleur
7fd2cbea49 Merge pull request #4257 from defrance/patch-91
add icalname on default event
2016-01-12 23:41:57 +01:00
Laurent Destailleur
97e96bed87 Merge pull request #4360 from GPCsolutions/develop-morelock
[Security] Detect lockfile even without configuration
2016-01-12 23:24:34 +01:00
Laurent Destailleur
3b60465f7b Merge pull request #4403 from frederic34/patch-7
Add number of records in expedition list
2016-01-12 23:19:28 +01:00
Laurent Destailleur
0a255decf8 Merge pull request #4401 from aspangaro/develop-p2
New: #3292 Make sure each and every page displays a title
2016-01-12 23:19:17 +01:00
Laurent Destailleur
381eea0dbf Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
2016-01-12 23:10:25 +01:00
Laurent Destailleur
0f53c49673 Merge pull request #4392 from aspangaro/3.9-p5
Fix: HRM index typo and presentation
2016-01-12 23:00:06 +01:00
Laurent Destailleur
233dc051a1 Merge pull request #4384 from hregis/3.9_bug
Fix: Gives the possibility to the module, to provide his own family info
2016-01-12 22:59:43 +01:00
Laurent Destailleur
64026c41f8 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-12 22:03:34 +01:00
Laurent Destailleur
d7fdcc83bb Fix missing search criteria 2016-01-12 22:03:19 +01:00