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

44857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Marcos García de La Fuente
c050fe2a27 Merge branch '3.6' into bug-1649 
Conflicts:
	ChangeLog
 2014-12-25 01:27:57 +01:00
Marcos García de La Fuente
1179f722af Merge branch '3.7' into bug-1533 2014-12-25 01:26:00 +01:00
Marcos García de La Fuente
82fa3a447b Merge branch '3.6' into translation 2014-12-25 01:18:58 +01:00
Juanjo Menent
f60d7ea2de Merge pull request #2176 from marcosgdf/bug-1722 
Fix: [ bug #1722 ] Missing link in homepage project's box
 2014-12-24 14:41:47 +01:00
Marcos García de La Fuente
b68276637b Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some 
masks

Conflicts:
	htdocs/core/lib/functions2.lib.php
 2014-12-24 14:31:17 +01:00
Juanjo Menent
c4a6377af5 Merge pull request #2169 from marcosgdf/bug-1736 
Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks
 2014-12-24 14:27:06 +01:00
Laurent Destailleur
a111c4765c Fixed: Filter lost with navigation 2014-12-23 18:00:14 +01:00
Laurent Destailleur
b7dbb1e9cd Fixed: Do not show disabled user when creating a new event. 2014-12-23 17:46:30 +01:00
Frédéric FRANCE
d03cc03cd7 Enhance select_salesrepresentatives with select2 2014-12-23 16:42:05 +01:00
Marcos García de La Fuente
034455fc2d Fix: [ bug #1722 ] Missing link in homepage project's box 2014-12-23 16:37:53 +01:00
Marcos García de La Fuente
416f13c708 Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H 2014-12-23 16:00:04 +01:00
Marcos García de La Fuente
743867b91b Spanish translation 2014-12-23 15:57:30 +01:00
Marcos García de La Fuente
78307a748d Corrected confusing table header in task list 2014-12-23 15:56:29 +01:00
Marcos García de La Fuente
a90a03412a Fixed string not translated in linked objects of a project 2014-12-23 15:43:45 +01:00
Laurent Destailleur
2b4edd9996 Fix: [ bug #1687 ] The ref filter searches on ref and rowid in supplier 
invoices list
 2014-12-23 13:21:40 +01:00
Laurent Destailleur
aa618d481b Fixed: [ bug #1690 ] Sorting on salary table triggers SQL errors 2014-12-23 13:07:16 +01:00
Laurent Destailleur
9e2f57007b Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-12-23 12:59:54 +01:00
Laurent Destailleur
acf7b9f130 Because this is a legal issue (OPCA), i added the hidden constant for 
3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button
"Classified Billed" is visible on proposal even if there is no invoice
linked to proposal.
Fixed: Also fix get list of invoice that report too many data.
 2014-12-23 12:59:34 +01:00
Laurent Destailleur
e8addcb8ba Fixed: [ bug #1756 ] PHP error while removing an import profile 2014-12-23 12:25:21 +01:00
Marcos García de La Fuente
8a14409974 Fix: [ bug #1533 ] Links triggers do not show trigger error message 2014-12-23 11:39:43 +01:00
Marcos García de La Fuente
3212fd2b27 Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify 2014-12-23 11:00:18 +01:00
Laurent Destailleur
56eddeade1 Fix merge changelog 2014-12-23 02:36:01 +01:00
Marcos García de La Fuente
db30186386 Fix: [ bug #1731 ] Can't use quick navigation on project tasks secondary tabs 2014-12-22 22:52:43 +01:00
Marcos García de La Fuente
46fe2c67e0 Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks 2014-12-22 22:32:05 +01:00
Frédéric FRANCE
748bef6134 Translation error 2014-12-22 20:02:53 +01:00
Laurent Destailleur
51a26ea5a9 Merge pull request #2163 from frederic34/patch-1 
Typo on conf variable
 2014-12-22 09:52:46 +01:00
Laurent Destailleur
22a7123cd9 Merge pull request #2164 from frederic34/patch-5 
Admin config for ask for payment bank during order
 2014-12-22 09:52:08 +01:00
Laurent Destailleur
e6d2bc0bff Maj icon 2014-12-22 03:12:01 +01:00
Laurent Destailleur
1dc2bbb0f1 Fixed: Var no declared 2014-12-22 03:01:31 +01:00
Laurent Destailleur
46fdd19389 Update image for menu 2014-12-22 02:54:38 +01:00
Laurent Destailleur
38b51c0a14 Prepare 3.7 release 2014-12-21 21:07:31 +01:00
Laurent Destailleur
31f782ffe9 Fix: Several fixes into tasks and time spent management 2014-12-21 14:58:18 +01:00
Laurent Destailleur
bdb47921e7 Fixed: Bad value for % increase for first year. 2014-12-21 14:15:36 +01:00
Frédéric FRANCE
82d403c347 Update admin.lang 2014-12-21 10:39:54 +01:00