Marcos García de La Fuente
|
98ed747671
|
Fix: [ bug #1765 ] Unable to create a contract
|
2014-12-28 17:17:08 +01:00 |
|
Marcos García de La Fuente
|
f738863e51
|
Revert previous commit
|
2014-12-28 17:14:11 +01:00 |
|
Marcos García de La Fuente
|
1b693fae7f
|
Merge branch '3.7' into bug-1765
|
2014-12-28 17:11:30 +01:00 |
|
Laurent Destailleur
|
41118a174a
|
Merge pull request #2195 from marcosgdf/bug-1714
Fix [ bug #1714 ] Id "sall" is used twice in different HTML tags
|
2014-12-26 22:11:37 +01:00 |
|
Marcos García de La Fuente
|
95c7ba33ba
|
Merge branch '3.7' into bug-1765
|
2014-12-26 12:10:38 +01:00 |
|
Marcos García de La Fuente
|
9f6f90275a
|
Fix [ bug #1714 ] Id "sall" is used twice in different HTML tags
|
2014-12-26 12:03:29 +01:00 |
|
Juanjo Menent
|
bdf5f5726f
|
Fix: Bad order field value
|
2014-12-26 09:29:27 +01:00 |
|
Laurent Destailleur
|
657fc1b91c
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
ChangeLog
htdocs/comm/fiche.php
htdocs/core/lib/functions2.lib.php
htdocs/fourn/fiche.php
htdocs/langs/fr_FR/compta.lang
htdocs/projet/element.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/time.php
|
2014-12-26 04:44:15 +01:00 |
|
Laurent Destailleur
|
d18770c1e7
|
Merge remote-tracking branch 'origin/3.5' into 3.6
|
2014-12-26 04:16:08 +01:00 |
|
Laurent Destailleur
|
0e952c67ff
|
Merge pull request #2193 from marcosgdf/bug-1761
Fix: [ bug #1761 ] SQL error when installing 3.7 with PostgreSQL
|
2014-12-26 04:14:03 +01:00 |
|
Laurent Destailleur
|
490b0c5f3a
|
Merge branch 'marcosgdf-bug-1768' into 3.5
|
2014-12-26 04:13:36 +01:00 |
|
Laurent Destailleur
|
77e48f8c3e
|
Merge branch 'bug-1768' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1768
|
2014-12-26 04:12:58 +01:00 |
|
Laurent Destailleur
|
882fd9a798
|
Merge branch 'marcosgdf-bug-1757' into 3.5
|
2014-12-26 04:11:30 +01:00 |
|
Laurent Destailleur
|
38c9d39c2b
|
Merge branch 'bug-1757' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1757
Conflicts:
ChangeLog
|
2014-12-26 04:11:15 +01:00 |
|
Laurent Destailleur
|
4e2c321e4d
|
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
Conflicts:
ChangeLog
|
2014-12-26 04:09:08 +01:00 |
|
Laurent Destailleur
|
83e34a1c4e
|
Merge branch 'marcosgdf-bug-1769' into 3.5
|
2014-12-26 04:07:53 +01:00 |
|
Laurent Destailleur
|
0da1c2e589
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2014-12-26 04:06:10 +01:00 |
|
Laurent Destailleur
|
420ebe0be9
|
Fix: Change order to create fields
|
2014-12-26 04:04:16 +01:00 |
|
Laurent Destailleur
|
3c500158a9
|
Merge pull request #2187 from marcosgdf/bug-1715
Fix [ bug #1715 ] Valign and width attributes are used in div tags
|
2014-12-26 04:02:46 +01:00 |
|
Laurent Destailleur
|
5215b1e641
|
Merge pull request #2186 from marcosgdf/bug-575
Fix [ bug #575 ] GED doesn't works if there is "/" in a mask
|
2014-12-26 04:02:01 +01:00 |
|
Laurent Destailleur
|
469aba888a
|
Merge pull request #2184 from marcosgdf/bug-1674
Fix: [ bug #1674 ] PayPal logo copyright issues
|
2014-12-26 03:52:34 +01:00 |
|
Laurent Destailleur
|
bba8653179
|
Merge pull request #2183 from marcosgdf/bug-1724
Fix: [ bug #1724 ] Can't add a submenu to projects
|
2014-12-26 03:50:36 +01:00 |
|
Laurent Destailleur
|
54437703fb
|
Merge pull request #2177 from frederic34/patch-7
Enhance select_salesrepresentatives with select2
|
2014-12-26 03:49:43 +01:00 |
|
Laurent Destailleur
|
f31bf5d80e
|
Merge pull request #2175 from marcosgdf/bug-1752
Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H
|
2014-12-26 03:49:02 +01:00 |
|
Laurent Destailleur
|
ade688b589
|
Merge pull request #2174 from marcosgdf/bug-1723
Fix [ bug #1723 ] Draft tasks?
|
2014-12-26 03:48:15 +01:00 |
|
Laurent Destailleur
|
b2d27a7d25
|
Merge pull request #2173 from marcosgdf/translation
Fixed string not translated in linked objects of a project
|
2014-12-26 03:47:56 +01:00 |
|
Laurent Destailleur
|
8d4186f438
|
Merge pull request #2172 from marcosgdf/bug-1533
Fix: [ bug #1533 ] Links triggers do not show trigger error message
|
2014-12-26 03:47:05 +01:00 |
|
Marcos García de La Fuente
|
745eece5fe
|
Fix: [ bug #1761 ] SQL error when installing 3.7 with PostgreSQL
|
2014-12-26 00:34:57 +01:00 |
|
Marcos García de La Fuente
|
8e47fe9e1c
|
Fix: [ bug #1757 ] Sorting breaks product/service statistics
|
2014-12-26 00:19:09 +01:00 |
|
Marcos García de La Fuente
|
1d39c1acc2
|
Fix: [ bug #1768 ] PHP Warning when error connecting to a PostgreSQL server in install script
|
2014-12-26 00:12:16 +01:00 |
|
Marcos García de La Fuente
|
f4def9ea28
|
Fix: [ bug #1769 ] Error when installing to a PostgreSQL DB that contains numbers
|
2014-12-26 00:07:24 +01:00 |
|
Laurent Destailleur
|
f3fded2a0a
|
Merge pull request #2171 from marcosgdf/bug-1649
Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify
|
2014-12-25 23:25:22 +01:00 |
|
Laurent Destailleur
|
6c67df0698
|
Merge branch 'marcosgdf-bug-1731' into 3.6
|
2014-12-25 23:21:55 +01:00 |
|
Laurent Destailleur
|
224fa14e16
|
Merge branch 'bug-1731' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1731
Conflicts:
ChangeLog
|
2014-12-25 23:21:48 +01:00 |
|
Laurent Destailleur
|
33045668cd
|
Merge pull request #2168 from frederic34/patch-5
Translation error
|
2014-12-25 23:19:42 +01:00 |
|
Laurent Destailleur
|
645bdec432
|
Merge pull request #2188 from marcosgdf/bug-1763
Fixed [ bug #1763 ] Undefined variable $interface in Project:574
|
2014-12-25 23:18:07 +01:00 |
|
Laurent Destailleur
|
bcf952374b
|
Merge pull request #2189 from marcosgdf/bug-1766
Fixed [ bug #1766 ] PHP Warning when adding a service to a supplier invoice
|
2014-12-25 23:16:46 +01:00 |
|
Marcos García de La Fuente
|
aec1bdb3c4
|
Fixed [ bug #1766 ] PHP Warning when adding a service to a supplier invoice
|
2014-12-25 23:08:07 +01:00 |
|
Marcos García de La Fuente
|
5ec38d89ff
|
Fixed [ bug #1763 ] Undefined variable $interface in Project:574
|
2014-12-25 22:59:57 +01:00 |
|
Marcos García de La Fuente
|
2616deb58d
|
Copyright info
|
2014-12-25 22:52:11 +01:00 |
|
Marcos García de La Fuente
|
eb524cfd29
|
Copyright info
|
2014-12-25 22:50:33 +01:00 |
|
Marcos García de La Fuente
|
7b6a4d1bfd
|
Fix: [ bug #1715 ] Valign and width attributes are used in div tags
|
2014-12-25 22:50:15 +01:00 |
|
Marcos García de La Fuente
|
c870f0e3db
|
Updated changelog
|
2014-12-25 22:30:47 +01:00 |
|
Marcos García de La Fuente
|
ca133d74ac
|
Corrected key not translated
|
2014-12-25 22:20:09 +01:00 |
|
Marcos García de La Fuente
|
da7dc2a393
|
Fix: [ bug #1765 ] Unable to create a contract
|
2014-12-25 22:02:22 +01:00 |
|
Marcos García de La Fuente
|
1f00794c98
|
Fixed bug which didn't show documents in auto GED when an object had '/' in its ref
|
2014-12-25 21:47:39 +01:00 |
|
Marcos García de La Fuente
|
9d82e16506
|
Resized PayPal logo
|
2014-12-25 19:17:52 +01:00 |
|
Marcos García de La Fuente
|
f735aa676e
|
Fix: [ bug #1674 ] PayPal logo copyright issues
|
2014-12-25 19:16:25 +01:00 |
|
Marcos García de La Fuente
|
146bba90e7
|
Fix: [ bug #1724 ] Can't add a submenu to projects
|
2014-12-25 18:42:26 +01:00 |
|
Marcos García de La Fuente
|
09a094104c
|
Removed duplicated and unused translation key
|
2014-12-25 18:31:24 +01:00 |
|