Commit Graph

6072 Commits

Author SHA1 Message Date
Laurent Destailleur
d5f3f47782 New: Use div for tabs. 2013-04-24 03:56:13 +02:00
Laurent Destailleur
39d3d1a34e Enhance script to send email to sale representatives 2013-04-23 12:00:31 +02:00
Laurent Destailleur
5cbb0359aa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-22 10:33:46 +02:00
Laurent Destailleur
ee843924dd Fix: Some translation change to have things more clear. 2013-04-22 10:33:06 +02:00
Laurent Destailleur
89ad634230 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/langs/fr_FR/holiday.lang
2013-04-22 01:39:49 +02:00
Laurent Destailleur
577346f44d Merge pull request #863 from defrance69/patch-28
Update products.lang
2013-04-21 16:27:10 -07:00
Laurent Destailleur
11023fa210 Merge pull request #857 from marcosgdf/task-823
New: [ task #823 ] Shipping_validate email notification
2013-04-21 16:07:37 -07:00
Laurent Destailleur
9f3164d710 Merge pull request #849 from GPCsolutions/ca_report_improvments
Improved reports
2013-04-21 15:13:34 -07:00
Laurent Destailleur
42b3d6e317 Merge pull request #865 from FHenry/develop
Add extrafield select from table
2013-04-21 15:12:04 -07:00
Laurent Destailleur
5893fadb58 Look: Minor style enhancement 2013-04-21 17:56:29 +02:00
fhenry
d6514e1cd6 Add extrafield select from table 2013-04-21 17:36:23 +02:00
BENKE Charles
72e571fcd5 Update products.lang
Add Fabrication Feature
2013-04-21 16:16:13 +03:00
Marcos García
82e3a8d0b9 New: [ task #823 ] Shipping_validate email notification 2013-04-21 14:14:30 +02:00
Laurent Destailleur
ab2709f684 Filter on agenda event are autoselected on "manual event". 2013-04-21 12:26:44 +02:00
fhenry
cae761d522 [ task #640 ] Better deposit invoice management 2013-04-20 17:10:03 +02:00
Raphaël Doursenaud
f2bd1461b2 Improved reports
Added amount without VAT for "CREANCES-DETTES" mode
Added turnover by products/services
Added categories filter for users and products/services
Added period management
Added list sorting
2013-04-20 07:33:10 +02:00
Laurent Destailleur
162ccf68b6 Merge pull request #841 from FHenry/develop
fix [ bug #825 ] User first name not visible into users->perms
2013-04-19 17:21:16 -07:00
Marcos García
d90a0acbec Missing externalsite module translations 2013-04-20 00:18:57 +02:00
fhenry
e2d0d0d414 Fix fix as Eldy wish it 2013-04-20 00:10:20 +02:00
Marcos García
40a9ab9772 Added missing translations 2013-04-20 00:08:09 +02:00
Marcos García
458b1cdf60 Improved dictionary translations + minor bug fix 2013-04-19 23:33:54 +02:00
Laurent Destailleur
8eedf3db96 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-19 09:11:09 +02:00
Laurent Destailleur
d5a4f73501 Add fill/reset 2013-04-19 09:10:56 +02:00
Laurent Destailleur
a880a8c51e Qual: Work to prepare usage of jquery data plugins. 2013-04-18 19:37:50 +02:00
fhenry
ce60e503bc Fix trans for [ task #826 ] Increasing stock when deleting an invoice 2013-04-18 18:10:56 +02:00
fhenry
c0c1de7992 [ task #826 ] Increasing stock when deleting an invoice 2013-04-18 08:40:29 +02:00
fhenry
4927aae891 [ task #741 ] Gestion des interventions/Add intervention box 2013-04-17 16:20:01 +02:00
Marcos García
0ac7696bc0 Improved holidays module translations
Conflicts:
	htdocs/holiday/fiche.php
	htdocs/langs/fr_FR/holiday.lang
2013-04-15 09:29:26 +02:00
Marcos García
6d896a8558 Improved holidays module translations 2013-04-15 00:53:06 +02:00
Marcos García
16afa18e95 Improved and added missing es_ES translations 2013-04-15 00:09:29 +02:00
Laurent Destailleur
de9f100968 Fix: check read feature 2013-04-14 20:34:31 +02:00
Laurent Destailleur
a5d996de4c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-14 14:45:43 +02:00
Laurent Destailleur
22402c38f8 Still working on new menu management. 2013-04-14 14:32:38 +02:00
fhenry
00fb40e073 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/es_ES/admin.lang

Change-Id: I3c2c0789a92fb3d5506c717986ce0127dec75b9b
2013-04-14 09:40:01 +02:00
Laurent Destailleur
e5a945ba5b Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	ChangeLog
	htdocs/admin/propal.php
	htdocs/compta/journal/purchasesjournal.php
	htdocs/compta/journal/sellsjournal.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/modules/mailings/contacts2.modules.php
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/en_US/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/public/demo/index.php
2013-04-14 01:46:33 +02:00
Laurent Destailleur
bda39f25bf New: Default aprrover for holidays i sby default hierchical parent. 2013-04-14 01:04:11 +02:00
Marcos García
418921f360 Revert "Revert "Added missing translation""
This reverts commit 85866ff9a6.
2013-04-13 17:14:06 +02:00
Marcos García
85866ff9a6 Revert "Added missing translation"
This reverts commit 404ad18425.
2013-04-13 17:10:07 +02:00
Marcos García
404ad18425 Added missing translation 2013-04-13 16:04:51 +02:00
Laurent Destailleur
2b94188414 Fix: Languages files permissions and loading 2013-04-13 14:09:50 +02:00
Laurent Destailleur
4bb815937a Module opensurvey become a standard feature. 2013-04-13 13:56:13 +02:00
fhenry
cc497490eb [ task #814 ] Add extrafield feature into Project/project tasks module 2013-04-12 11:09:53 +02:00
Laurent Destailleur
8e3f0172fc Fix: Fix tons of pb with num ref system of supplier invoices. 2013-04-12 00:00:31 +02:00
Laurent Destailleur
72f0ca194c Fix: Solve conflict of translation 2013-04-10 19:28:54 +02:00
Laurent Destailleur
d7c0cf3d50 Fix: More complete fix for emailing contact selectors. 2013-04-10 16:29:53 +02:00
Laurent Destailleur
72aec6aa60 Better translation 2013-04-10 13:30:54 +02:00
Laurent Destailleur
328801f455 Hide upload on smartphones 2013-04-09 01:27:41 +02:00
Laurent Destailleur
826d8a329d Merge pull request #802 from simnandez/develop
Fix: Try to showing the events related to a intervention
2013-04-07 13:54:53 -07:00
Laurent Destailleur
d0d146cabf Translation 2013-04-07 20:15:03 +02:00
simnandez
7b70fc4bf3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
2013-04-07 14:30:44 +02:00