Commit Graph

67554 Commits

Author SHA1 Message Date
Laurent Destailleur
e9b4141dd9 Fix syntax error 2018-06-23 17:11:19 +02:00
Laurent Destailleur
3fa5649040 Fix bad test (dev journal visible when dev option on) 2018-06-23 15:22:39 +02:00
Laurent Destailleur
2db2ea3627 Fix colspan 2018-06-23 15:13:39 +02:00
Laurent Destailleur
00165871bd CSS 2018-06-23 15:10:44 +02:00
Laurent Destailleur
0170906524 Look and feel 2018-06-23 14:39:24 +02:00
Laurent Destailleur
6dba88ab6e Several fixes in look and feel 2018-06-23 14:23:07 +02:00
Laurent Destailleur
dbb90e80a3 Fix syntax error 2018-06-23 12:57:41 +02:00
Laurent Destailleur
eb88f1e5c9 Fix look and feel v8 2018-06-23 12:41:03 +02:00
Laurent Destailleur
06342ff80c FIX contextpage on contact list 2018-06-23 12:06:17 +02:00
Laurent Destailleur
4dcc74d08f Fix the "back to list" link also restore the contextpage 2018-06-23 11:55:04 +02:00
Laurent Destailleur
f2ac5dab4a Fix contextpage of some menu entries 2018-06-23 10:28:06 +02:00
Laurent Destailleur
604a5a3568 trans 2018-06-23 00:19:47 +02:00
Laurent Destailleur
c871e81a52 Trans 2018-06-23 00:15:57 +02:00
Laurent Destailleur
7daee6dc6b A lot of fix of css and look and feel v8 2018-06-23 00:07:56 +02:00
Laurent Destailleur
83f4cf67e6 css 2018-06-22 23:21:16 +02:00
Laurent Destailleur
be2309c70f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-22 22:54:11 +02:00
Laurent Destailleur
27a27e02a1 Fix css 2018-06-22 22:53:53 +02:00
Laurent Destailleur
02fbe4a84c Merge pull request #8991 from hregis/develop_product
Fix: avoid Warning: A non-numeric value encountered
2018-06-22 15:52:05 +02:00
Laurent Destailleur
6f1101a2d6 Update card.php 2018-06-22 15:51:26 +02:00
Laurent Destailleur
1bf0432a72 Merge pull request #8997 from ptibogxiv/patch-29
add minute to duration services
2018-06-22 15:12:57 +02:00
Laurent Destailleur
1cef4c1563 Merge pull request #8995 from ATM-Marc/FIX_develop_PR8841
FIX PR #8841
2018-06-22 15:10:33 +02:00
Laurent Destailleur
ac19a6e211 Merge pull request #8993 from hregis/develop_pgsql
Fix: wrong field name, use "type" instead "llx_c_type_fees"
2018-06-22 15:09:31 +02:00
Laurent Destailleur
c3c809cfc1 Merge pull request #9001 from dani/sync_rfc2307_members
Sync rfc2307 group membership from LDAP
2018-06-22 14:56:45 +02:00
Laurent Destailleur
11d4241221 Merge pull request #9002 from grandoc/new_branch_21_06_2018
clean and update code
2018-06-22 14:55:11 +02:00
Laurent Destailleur
430dea917e Merge pull request #9005 from dolibarr95/patch-47
FIX: Add rights check in shipping
2018-06-22 14:54:47 +02:00
Laurent Destailleur
0f80508be1 Fix canvas on list is a feature going in the wall so i clean this. 2018-06-22 14:51:47 +02:00
Laurent Destailleur
77e7b5793f Fix translation 2018-06-22 14:31:45 +02:00
dolibarr95
45451f08b0 Add rights check
Add rights check when edit parcel informations(weight, tracking...) of a shipping
2018-06-22 12:25:14 +02:00
Laurent Destailleur
81497687e9 Fix missing oldcopy in trigger call 2018-06-22 10:55:36 +02:00
Laurent Destailleur
88d3bf0148 FIX creation of tasks must hide closed project 2018-06-21 18:47:02 +02:00
Philippe GRAND
da2f07c848 clean and update code 2018-06-21 15:01:45 +02:00
Daniel Berteaud
f4bfd8704d Sync rfc2307 group membership from LDAP
With rfc2307 LDAP scheme, group members are listed in the memberUid attribute, as simple uid, not as full DN like rfc2307bis, or AD-style groups
2018-06-21 10:21:18 +02:00
Laurent Destailleur
cfcedc1170 Fix remove old unique key constraint 2018-06-21 00:11:37 +02:00
Laurent Destailleur
1a8afeff2a Fix error message 2018-06-20 23:50:50 +02:00
Laurent Destailleur
a3b9d4f01b Fix tooltip on subsidiary list 2018-06-20 22:02:36 +02:00
Laurent Destailleur
07c514b85c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/projet/class/projectstats.class.php
2018-06-20 21:56:10 +02:00
Laurent Destailleur
828a9296b4 Fix stats on project 2018-06-20 21:52:06 +02:00
Laurent Destailleur
714057d435 Fix stats on project. Must use assignement on project as filter. 2018-06-20 21:31:37 +02:00
Laurent Destailleur
90b2314d98 Code comment 2018-06-20 21:24:57 +02:00
Laurent Destailleur
9f2437fa04 Fix missing field 2018-06-20 17:59:01 +02:00
ptibogxiv
a6151ee11e add minute to duration services
add minute for duration description (more compliant thant 0,166667h for billing services  by minute
2018-06-20 12:10:25 +02:00
Marc de Lima Lucio
dc951029cd Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_pdf_note_incoterm 2018-06-20 10:31:35 +02:00
Marc de Lima Lucio
babc99465c FIX PR #8841 2018-06-20 10:22:43 +02:00
Marc de Lima Lucio
9fa9a716d5 FIX: pdf: overlap when linked elements and incoterms/public note displayed + port PR #8155 into supplier docs & contracts 2018-06-20 10:22:43 +02:00
Regis Houssin
e1db5ab433 Fix: wrong field name, use "type" instead "llx_c_type_fees" 2018-06-19 19:56:39 +02:00
Laurent Destailleur
a73296e212 Fix reseller not saved 2018-06-19 19:34:23 +02:00
Regis Houssin
b9fe6f8624 Fix: avoid warning 2018-06-19 19:00:23 +02:00
Regis Houssin
2c927dba01 Fix: wrong var name "shownav" 2018-06-19 18:33:22 +02:00
Regis Houssin
b9893bde1d Fix: avoid Warning: A non-numeric value encountered 2018-06-19 18:26:37 +02:00
bgenere
403116898f Fix cherry-pick 2018-06-19 18:25:52 +02:00