Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-13 13:01:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
52,830 Commits 36 Branches 190 Tags
30aea901b8f83d4563c864abb841a3e4f7ce9e83
Commit Graph

9302 Commits

Author SHA1 Message Date
Laurent Destailleur
7b7d27920d Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/adherents/type.php
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/product/composition/card.php
 2015-10-10 18:56:28 +02:00
Laurent Destailleur
525f9841fa Fix doxygen 2015-10-10 18:38:22 +02:00
Laurent Destailleur
fb50daaa40 Fix bad parameter 2015-10-10 16:09:01 +02:00
Laurent Destailleur
0222867a94 The new banner for tab is moved into a shared functions 2015-10-10 12:01:09 +02:00
aspangaro
8e37da55c3 Add searchform, language key and correct code 2015-10-10 08:34:15 +02:00
aspangaro
8f8de587b8 Add admin & first version to manage establishment 2015-10-10 06:39:59 +02:00
aspangaro
cd7c5645c7 Add library 2015-10-10 06:38:42 +02:00
aspangaro
5d7e05e313 Correct review 2015-10-10 06:00:55 +02:00
aspangaro
f6947afc2f Merge remote-tracking branch 'Upstream/develop' into develop-hrm 2015-10-10 05:42:06 +02:00
Laurent Destailleur
f4f7629037 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/class/html.form.class.php
 2015-10-10 02:10:14 +02:00
Laurent Destailleur
effba68511 Start to work on a common banner for tabs (goal is to have a nicer and 
generic part for all element)
 2015-10-10 01:51:12 +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
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
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
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
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
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
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
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
Florian HENRY
1f2a86078a FIX : Always use type send in parameters in showCategories method 2015-10-08 11:03:08 +02:00
philippe grand
0e343ae3b2 syntax error 2015-10-08 09:34:02 +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
Laurent Destailleur
8d47a307bb Better use of space 2015-10-06 21:52:42 +02:00
Laurent Destailleur
6ea05aa311 FIX Bad translation key for project "Overview" 2015-10-06 16:03:47 +02:00
Laurent Destailleur
d92604f646 FIX Link of project must be cickable if user has permission to read all 
projects
FIX Missing information into the alt of project picto
 2015-10-06 00:46:26 +02:00
Raphaël Doursenaud
3fdd59bf0a Fix #3666 checkbox extrafields on edit 2015-10-05 20:39:14 +02:00
Raphaël Doursenaud
41354ca00d Added type hinting to extrafields object 2015-10-05 20:30:55 +02:00
Raphaël Doursenaud
d24f5538f9 Fix: wrong parameters order 2015-10-05 20:25:55 +02:00
Laurent Destailleur
e3f225e038 FIX bad link into project box 2015-10-05 19:41:41 +02:00
Andreas, OE8APR
3aeeab9654 Get proposal customer contact 
Added functionality to get proposal customer contact as contact_xx tags
 2015-10-05 17:51:26 +02:00
Andreas, OE8APR
e3bdc8aaaa Get invoice customer contact 
Added functionality to get invoice customer contact as contact_xx tags
 2015-10-05 17:50:56 +02:00
Christophe Battarel
bf262c2cae reenable search criteria in sql clause 2015-10-05 15:41:28 +02:00
Laurent Destailleur
143c1e03f8 FIX Missing menu entry for list of thirdparties when using auguria menu 
manager
 2015-10-05 10:30:49 +02:00
Laurent Destailleur
68d4a9fc63 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/societe/list.php
 2015-10-04 20:57:00 +02:00
Laurent Destailleur
17416dba89 Merge pull request #3651 from frederic34/patch-20 
Add badge for number of files in bank's tab
 2015-10-04 20:03:41 +02:00
Frédéric FRANCE
780a5a1996 Update files.lib.php 2015-10-04 19:59:26 +02:00
Laurent Destailleur
85a5b0fc69 Merge pull request #3652 from grandoc/develop 
FIX : typo
 2015-10-04 19:57:12 +02:00
Laurent Destailleur
77218194c6 Merge pull request #3657 from frederic34/patch-16 
Fix: #3552
 2015-10-04 19:56:22 +02:00
frederic34
7f86797f73 Add contact photo 2015-10-04 17:25:46 +02:00
Laurent Destailleur
75e337e8d9 FIX select of project using ajax autocomplete option 2015-10-04 16:02:50 +02:00
Frédéric FRANCE
6f513fabef Update DolibarrModules.class.php 2015-10-03 23:45:25 +02:00
Juanjo Menent
9d60dee781 Issue #3509: Ready for customers 2015-10-03 17:15:25 +02:00
Juanjo Menent
03a2fd740d Issue #3509: Ready for customers 2015-10-03 16:58:46 +02:00
philippe grand
322928fbae Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-10-03 16:33:16 +02:00
Juanjo Menent
92f4c0d015 Merge remote-tracking branch 'upstream/develop' into dolibarr-3509 2015-10-03 16:01:24 +02:00
Juanjo Menent
5d10fc2c77 Merge pull request #3644 from frederic34/patch-14 
can't access documents for bank
 2015-10-03 15:57:58 +02:00