Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
36,953 Commits 36 Branches 189 Tags
c97d1cb15b94d9b3850d2d179d620e0e3d828fb1
Commit Graph

4411 Commits

Author SHA1 Message Date
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
simnandez
e27e5e9c44 Improved margins ca_ES translation 2013-04-14 13:53:48 +02:00
Marcos García
6b031616fa Improved margins es_ES translation 2013-04-14 12:34:10 +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
Laurent Destailleur
7e48e341ad Merge pull request #829 from marcosgdf/translations 
Added missing translation
 2013-04-13 14:23:07 -07:00
Marcos García
7c4b901b0a Improved es_ES translations and replaced missing translation 2013-04-13 17:45:41 +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
Marcos García
d6b42ac879 [ bug #816 ] Sales journal does not reflect localtaxes 2013-04-13 14:44:56 +02:00
Laurent Destailleur
2b94188414 Fix: Languages files permissions and loading 2013-04-13 14:09:50 +02:00
Laurent Destailleur
3683f3cc82 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-13 13:56:26 +02:00
Laurent Destailleur
4bb815937a Module opensurvey become a standard feature. 2013-04-13 13:56:13 +02:00
Marcos García
b6f765ef3c Improved es_ES translations 2013-04-12 23:51:52 +02:00
fhenry
cc497490eb [ task #814 ] Add extrafield feature into Project/project tasks module 2013-04-12 11:09:53 +02:00
simnandez
2e9a8369a7 Trad: Update ca_ES and es_ES translations 2013-04-12 10:46:33 +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
Grand Philippe
f4e58d71ed add supplier invoice extrafields and some fixes 2013-04-09 09:38:25 +02:00
Laurent Destailleur
328801f455 Hide upload on smartphones 2013-04-09 01:27:41 +02:00
Grand Philippe
5b5b57d4e0 some fixes for supplier orders extrafields 2013-04-08 23:20:35 +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
Laurent Destailleur
4e5a71fb22 New: Add local and vat rate for peru 2013-04-06 18:59:22 +02:00
Laurent Destailleur
eaab6d0caa Trans: For peru, IVA is IGV 2013-04-06 18:51:07 +02:00
Marcos García
6252857440 Fixed translations and BILL_SUPPLIER_BUILDDOC trigger 2013-04-06 17:56:10 +02:00
Laurent Destailleur
25ec7eed6d New: Can send email to warn when payment for subscription is payed. 2013-04-06 16:14:28 +02:00
simnandez
50548601ce Resolve conflicts 2013-04-06 08:20:57 +02:00
Laurent Destailleur
1cf2276584 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/prospect/list.php
 2013-04-05 22:59:06 +02:00
Laurent Destailleur
545ac638b0 Qual: Removed deprecated code for using a specific mobile theme. 
New: Include terminal variables to optimize any themes.
Qual: First change to allow butAction buttons to wrap on new lines for
small size screens.
 2013-04-03 15:20:56 +02:00
fhenry
be01297403 Fix Ducth (nl_NL) translation 2013-04-03 11:56:54 +02:00
fhenry
735e107a51 Better error management on extrafailed input 2013-04-02 14:12:21 +02:00
fhenry
e93b6141e1 Add translation for extrafield 2013-04-02 12:04:37 +02:00
fhenry
893fed9284 [ task #783 ] Add checkbox and radio into extrafield feature 2013-04-02 11:56:53 +02:00
Laurent Destailleur
cc69cf7b76 New: Can defined a clicktodial setup per user 2013-03-31 16:44:24 +02:00
Laurent Destailleur
294a085047 New: ClickToDial setup is easier 2013-03-31 04:03:08 +02:00
Laurent Destailleur
fa6e9d2d47 Missing trans key 2013-03-30 21:25:37 +01:00
Laurent Destailleur
a5799b3ae8 Trans for SMS 2013-03-30 21:25:00 +01:00
Laurent Destailleur
000fe2c864 New: Better error management for add/remove of memeber into mailman. 2013-03-30 18:04:33 +01:00
Laurent Destailleur
1eec85da9d Merge pull request #791 from grandoc/develop 
Develop
 2013-03-30 07:58:48 -07:00
Laurent Destailleur
4208f11d87 Enhance fixutf8bomfiles and fixdosfiles tools. 2013-03-30 15:57:54 +01:00
Grand Philippe
ee7490a30a fix : language error 2013-03-30 14:31:10 +01:00