Commit Graph

8281 Commits

Author SHA1 Message Date
Laurent Destailleur
7fae9450a3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-11 15:21:45 +02:00
Laurent Destailleur
bd48ad265d The new banner tab is also on user card now 2015-10-11 15:21:21 +02:00
Laurent Destailleur
0ba6bdb7c2 CSS enhancement 2015-10-11 13:26:22 +02:00
Laurent Destailleur
db9d09c7a3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-11 12:28:03 +02:00
Laurent Destailleur
6ec77e2ca0 New banner card on contact card. 2015-10-11 12:27:04 +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
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
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
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
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
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
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
philippe grand
298fafd7d2 fix : internationalization 2015-10-03 15:10:53 +02:00
philippe grand
b6de2a954c fix : internationalization 2015-10-03 15:04:03 +02:00
Juanjo Menent
67d28d6991 Merge remote-tracking branch 'upstream/develop' into dolibarr-3509
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-10-03 14:59:56 +02:00
philippe grand
82c7022e20 Fix : internationalization 2015-10-03 14:47:11 +02:00
Laurent Destailleur
c0c0cc2415 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/interventions.lang
	htdocs/theme/md_exp/style.css.php
2015-10-03 14:28:31 +02:00
Frédéric FRANCE
7da49a3592 Add badge for number of files in bank's tab 2015-10-03 12:09:42 +02:00
Laurent Destailleur
10b481f47f Fix colspan 2015-10-03 11:15:12 +02:00
Frédéric FRANCE
d451051d97 can't access documents for bank 2015-10-02 16:29:54 +02:00
Laurent Destailleur
43f09dfccf Work on theme 2015-10-02 16:26:08 +02:00
Juanjo Menent
4c1e018ded Merge pull request #3621 from fmarcet/3.8
FIX Only are showing one object linked
2015-10-02 11:03:19 +02:00
Laurent Destailleur
60c0338d64 FIX #3628 2015-10-01 16:50:18 +02:00
Laurent Destailleur
e76124add5 FIX #3606 2015-10-01 16:09:51 +02:00
Laurent Destailleur
b57c156b60 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/core/modules/modContrat.class.php
	htdocs/fichinter/card.php
	htdocs/install/upgrade2.php
2015-10-01 11:16:35 +02:00
Laurent Destailleur
9c28894ec3 Merge pull request #3615 from FHenry/3.7
FIX : When delete actioncomm also delete actioncomm_resources
2015-10-01 10:34:54 +02:00
Laurent Destailleur
d4b5256f18 Merge pull request #3611 from atm-alexis/develop
FIX there is no way to hide or change qty by hook
2015-10-01 10:27:26 +02:00