Commit Graph

52175 Commits

Author SHA1 Message Date
Laurent Destailleur
384c89dcef Merge pull request #3701 from altatof/fix_orderdateonclone
FIX: change order date on clone (as everywhere else)
2015-10-09 20:44:03 +02:00
Laurent Destailleur
856bfaaa3a Merge pull request #3691 from FHenry/3.8
FIX : Always use type send in parameters in showCategories method
2015-10-09 20:39:28 +02:00
Laurent Destailleur
4fab809604 Merge pull request #3684 from aspangaro/3.8-21
Fix : Lines from ER show date in english format
2015-10-09 20:38:29 +02:00
Laurent Destailleur
279e7028fb Merge pull request #3686 from grandoc/3.7
3.7
2015-10-09 20:38:16 +02:00
Laurent Destailleur
0899519dd6 Merge pull request #3671 from ndrosis/patch-19
Display names and numbers calls on
2015-10-09 20:36:00 +02:00
Laurent Destailleur
f9485bd25b Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/core/class/extrafields.class.php
2015-10-09 20:35:17 +02:00
Laurent Destailleur
b27989d5d4 Merge pull request #3665 from altatof/fix_extrafields
reenable search criteria in sql clause
2015-10-09 20:32:42 +02:00
Laurent Destailleur
c675f88dda Merge pull request #3678 from GPCsolutions/3.7-calcul_price_total-warning
[Qual] Prevent warning
2015-10-09 20:29:24 +02:00
Laurent Destailleur
eeac01b794 Merge pull request #3683 from aspangaro/develop-68
New : Add payment donation in accountancy expert & presentation
2015-10-09 20:25:50 +02:00
Laurent Destailleur
2937ad219a Merge pull request #3682 from tysauron/develop
For not error Undefined property: stdClass::$id
2015-10-09 20:25:39 +02:00
Laurent Destailleur
dea095dbf7 Merge pull request #3710 from GPCsolutions/3.8-rmdebug
Fix: remove debugging leftover
2015-10-09 20:19:41 +02:00
Laurent Destailleur
ab4b423567 Merge pull request #3712 from GPCsolutions/fixunittests
Fix unittests regression
2015-10-09 20:19:21 +02:00
Laurent Destailleur
796a87e254 Merge pull request #3673 from apachler/develop
Changes to ODT creation of proposal and invoice
2015-10-09 20:18:55 +02:00
Laurent Destailleur
e886c89e06 Merge pull request #3668 from altatof/fix_stock_entity
fix entities warehouse share
2015-10-09 20:16:32 +02:00
Laurent Destailleur
53c9cb38ef Merge pull request #3664 from FHenry/3.7
FIX : New adherent from, always redirect on entity
2015-10-09 20:15:23 +02:00
Laurent Destailleur
be9027df1a Merge pull request #3687 from grandoc/3.8
syntax error
2015-10-09 20:14:08 +02:00
Laurent Destailleur
a1d37f92cb Several fix in CSS 2015-10-09 20:00:43 +02:00
Raphaël Doursenaud
b785db86a8 Fix unittests regression
Introduced by incomplete renaming
of modSyncSupplierWebServices to modWebServicesClient
in 4b103ba8ce
2015-10-09 19:02:44 +02:00
Laurent Destailleur
53e4cb3af9 Several fix in CSS 2015-10-09 17:21:38 +02:00
Laurent Destailleur
f29c03c922 Start to work on a multiselect component to select which fields to show
into dolibarr lists.
2015-10-09 16:35:14 +02:00
Raphaël Doursenaud
497c751fb9 Fix: remove debugging leftover 2015-10-09 16:24:42 +02:00
Laurent Destailleur
82428fea68 NEW: Only arrow of current sorted field is visible into table views.
This save a lot of spaces. You can click on the column title to sort.
This make clickable area larger and click to sort is easier.
2015-10-09 13:01:50 +02:00
aspangaro
bde7279aa1 Review by Rdoursenaud. Tkanks 2015-10-09 13:00:51 +02:00
Laurent Destailleur
61d739635e Uniformize code and css for tables. Filters must be implemented
following example in test_arrays.php.
2015-10-09 12:30:16 +02:00
aspangaro
b571cc86ff Add a yn form in user card to know if the user is also an employee 2015-10-09 07:30:48 +02:00
aspangaro
6a7892ca52 Add the first tables 2015-10-09 06:41:36 +02:00
aspangaro
d9693ba2f2 New : Module HRM 2015-10-09 06:16:43 +02:00
Laurent Destailleur
2fc11a289e When there is no contact, no need to show filters 2015-10-09 00:30:02 +02:00
Laurent Destailleur
cfc70c7f92 Smaller image 2015-10-08 23:55:15 +02:00
Laurent Destailleur
2b17cd3353 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-08 23:50:24 +02:00
Laurent Destailleur
0d799402d0 Work on image for "no photo" with better resolution 2015-10-08 23:50:17 +02:00
Christophe Battarel
00f0aff6f0 FIX: change order date on clone (as everywhere else) 2015-10-08 15:58:19 +02:00
Florian HENRY
1f2a86078a FIX : Always use type send in parameters in showCategories method 2015-10-08 11:03:08 +02:00
philippe grand
0841feda47 syntax error 2015-10-08 09:40:00 +02:00
philippe grand
0e343ae3b2 syntax error 2015-10-08 09:34:02 +02:00
philippe grand
6cce2860c2 Merge branch '3.7' of https://github.com/Dolibarr/dolibarr.git into 3.7 2015-10-08 09:12:36 +02:00
aspangaro
425e7ce808 Fix : ER Show date in english format 2015-10-07 22:31:23 +02:00
aspangaro
deaf23870e Cancel work on responsive design 2015-10-07 21:52:30 +02:00
aspangaro
f8ade01f0e New : Add payment donation in accountancy expert 2015-10-07 21:48:46 +02:00
aspangaro
e0f2c41a37 Merge remote-tracking branch 'Upstream/develop' into develop-68 2015-10-07 21:08:00 +02:00
aspangaro
e1f946578b Fix presentation 2015-10-07 21:06:55 +02:00
tysauron
ea949437ab For not error Undefined property: stdClass::$id 2015-10-07 17:17:32 +02:00
Laurent Destailleur
644f98c158 Merge pull request #3676 from GPCsolutions/contributing
Enhanced contributing guidelines
2015-10-07 14:31:52 +02:00
Laurent Destailleur
8f5d9597f8 Merge pull request #3675 from GPCsolutions/3.7-3666
Fixes for checkbox extrafields
2015-10-07 14:31:30 +02:00
Laurent Destailleur
8db83a51b2 Missing translation 2015-10-07 14:30:54 +02:00
Laurent Destailleur
9e12de7d83 FIX Missing exclude to avoid duplicate menu css declaration 2015-10-07 08:34:57 +02:00
Laurent Destailleur
4b103ba8ce Work on a better way to manage modules. All one page. Introduce a way to
choose order of modules family. We should also be able to introduce
filters.
2015-10-07 08:13:23 +02:00
aspangaro
01a6a0ffba Merge commit 'c74bf517e2895b09738996fb55f2f509bf46e7f1' into develop-68 2015-10-07 06:29:48 +02:00
Laurent Destailleur
8d47a307bb Better use of space 2015-10-06 21:52:42 +02:00
Laurent Destailleur
72cabe2fc3 More complete description of margin rules calculation 2015-10-06 19:27:48 +02:00