lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,965 Commits 43 Branches 150 Tags 886 MiB
cb8cbecbde
Commit Graph

34965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juanjo Menent
cb8cbecbde Merge pull request #831 from marcosgdf/translations 
Improved margins module es_ES translation
 2013-04-14 04:44:03 -07:00
Marcos García
6b031616fa Improved margins es_ES translation 2013-04-14 12:34:10 +02:00
Laurent Destailleur
6ebeb53a2c Merge pull request #828 from marcosgdf/bug-817 
[ bug #817 ] Purchases journal does not reflect localtaxes
 2013-04-13 16:29:07 -07:00
Marcos García
486425d258 Merge branch '3.3' into bug-817 
Conflicts:
	ChangeLog
 2013-04-13 23:58:05 +02:00
Laurent Destailleur
7e48e341ad Merge pull request #829 from marcosgdf/translations 
Added missing translation
 2013-04-13 14:23:07 -07:00
Laurent Destailleur
8d4da9df1e Merge pull request #827 from marcosgdf/bug-816 
[ bug #816 ] Sales journal does not reflect localtaxes
 2013-04-13 14:22:40 -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
a6ed2551fb Revert "Replaced Rest not translated string with AlreadyPaid" 
This reverts commit 580881c205.
 2013-04-13 17:13:59 +02:00
Marcos García
580881c205 Replaced Rest not translated string with AlreadyPaid 2013-04-13 17:12:16 +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
b3a035951f [ bug #817 ] Purchases journal does not reflect localtaxes 2013-04-13 15:22:59 +02:00
Marcos García
3ed4d7bfbf Updated changelog 2013-04-13 14:46:43 +02:00
Marcos García
d6b42ac879 [ bug #816 ] Sales journal does not reflect localtaxes 2013-04-13 14:44:56 +02:00
Laurent Destailleur
1409b2b81a Merge pull request #826 from marcosgdf/3.3 
Improved translations
 2013-04-13 04:36:50 -07:00
Marcos García
ac0cd975cd Added missing table head strings into supplier invoices 2013-04-13 13:03:13 +02:00
Marcos García
b6f765ef3c Improved es_ES translations 2013-04-12 23:51:52 +02:00
Regis Houssin
9596134e47 Fix: use new method 2013-04-12 10:28:19 +02:00
Regis Houssin
85e09a953f Fix: missing return with hook 2013-04-12 10:04:10 +02:00
Laurent Destailleur
4910871180 Merge pull request #824 from marcosgdf/3.3 
Translated linked object propal module name
 2013-04-11 15:23:31 -07:00
Marcos García
9ec74194a0 Translated linked object propal module name 2013-04-11 23:10:27 +02:00
Regis Houssin
662d9cfa6e Fix: for avoid problem with multicompany thirdparty sharing 2013-04-11 17:11:15 +02:00
Laurent Destailleur
76c180aaaf Fix: encoding at wrong place 2013-04-10 23:13:55 +02:00
Laurent Destailleur
d570aa02d4 Fix: bad url 2013-04-10 23:11:21 +02:00
Laurent Destailleur
3bcd506e73 Fix: demo modules list 2013-04-10 23:06:38 +02:00
Laurent Destailleur
43d4bb6155 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-04-10 19:30:51 +02:00
Laurent Destailleur
72f0ca194c Fix: Solve conflict of translation 2013-04-10 19:28:54 +02:00
Laurent Destailleur
c4d0c4c3e5 Merge pull request #821 from FHenry/3.3 
Fix bug : change path of ODT template for commande and propal module
 2013-04-10 08:15:57 -07:00
fhenry
5d94b0c576 Fix bug : change path of ODT template for commande and propal module 2013-04-10 16:34:06 +02:00
Regis Houssin
19e902ef8f Fix: filter on all contacts, not just those related to a company 2013-04-10 16:00:30 +02:00
Regis Houssin
b80d4874e3 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2013-04-10 15:34:51 +02:00
Regis Houssin
057365b69e Fix: change for experimental encryption 2013-04-10 15:33:03 +02:00
Regis Houssin
eb78de1981 Merge pull request #820 from FHenry/3.3 
Fix bug with multicompany (SYSLOG_FILE on wrong entity)
 2013-04-10 06:20:06 -07:00
fhenry
38e30836a5 Fix bug with multicompany (SYSLOG_FILE on wrong entity) 2013-04-10 15:08:03 +02:00
Regis Houssin
8118332dfb Fix: security 
Conflicts:
	htdocs/core/modules/mailings/contacts2.modules.php
 2013-04-10 13:00:05 +02:00
Laurent Destailleur
f17ba4814e Merge pull request #816 from FHenry/3.3 
Fix [ bug #810 ] Cannot update ODT template path
 2013-04-08 14:28:51 -07:00
fhenry
98aaec18a7 Fix [ bug #810 ] Cannot update ODT template path 2013-04-08 18:08:38 +02:00
Regis Houssin
f3bbfe375c Fix: for multicompany compatibility 2013-04-08 12:41:48 +02:00
Laurent Destailleur
4ce7a70411 Merge pull request #813 from marcosgdf/3.3 
Removed duplicated code and fixed a problem with orders2invoice
 2013-04-07 14:00:32 -07:00
Laurent Destailleur
19c8336e6e Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-04-07 22:51:31 +02:00
Marcos García
303cf3bc41 Updated changelog 2013-04-07 22:01:33 +02:00
Marcos García
6013916d45 Removed duplicated code and fixed a problem with orders2invoice 2013-04-07 21:58:24 +02:00
Laurent Destailleur
b678183ff2 Log 2013-04-07 21:09:57 +02:00
Juanjo Menent
29124649bd Merge pull request #810 from simnandez/3.3 
Update ChangeLog
 2013-04-07 07:09:10 -07:00
simnandez
8f67606685 Spelling fix 2013-04-07 16:04:57 +02:00
simnandez
35279f6520 Update ChangeLog 2013-04-07 15:17:31 +02:00
simnandez
515c5e58ca Update Changelog 2013-04-07 15:04:55 +02:00
Laurent Destailleur
64a9689473 Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on 
payment
 2013-04-07 14:41:42 +02:00
Laurent Destailleur
4ceeea4a1c Fix: Can't reset payment due date 2013-04-07 14:41:08 +02:00