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

34978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juanjo Menent
1602fcf7bc Merge pull request #837 from FHenry/3.3 
Fix [ bug #789 ] VAT not being calculated in POS
 2013-04-15 23:54:03 -07:00
fhenry
7d6c89169c Fix [ bug #789 ] VAT not being calculated in POS 2013-04-15 23:06:03 +02:00
Regis Houssin
7177e59ea4 Fix: missing quote 2013-04-15 21:41:34 +02:00
Regis Houssin
21056d2b78 Fix: missing current entity record 2013-04-15 21:27:01 +02:00
simnandez
76132206bf Fix: Bad link to all proposals into Third party card if customer is 
prospect
 2013-04-15 17:12:31 +02:00
Juanjo Menent
67b803243f Merge pull request #834 from marcosgdf/translations-3.3 
Improved es_ES holidays translations
 2013-04-15 00:22:02 -07:00
Marcos García
6d896a8558 Improved holidays module translations 2013-04-15 00:53:06 +02:00
Marcos García
deaa63960e Improved es_ES holidays translations 2013-04-15 00:18:08 +02:00
simnandez
e27e5e9c44 Improved margins ca_ES translation 2013-04-14 13:53:48 +02:00
Juanjo Menent
e934614fce Merge pull request #830 from marcosgdf/bug-807 
Fixed bug #807: Margins modules with orders2invoice does not respect cost price
 2013-04-14 04:44:58 -07:00
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
0e34df43b1 Updated changelog 2013-04-14 13:09:00 +02:00
Marcos García
b6ce386513 Converted indentation to tabs 2013-04-14 13:07:05 +02:00
Marcos García
90b9e7c136 Fixed bug #807: Margins modules with orders2invoice does not respect cost price 
Also, removed duplicated requires in orderstoinvoice.php
 2013-04-14 13:06:13 +02: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