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

44720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Frédéric FRANCE
3d9ce4c1dc Admin config for ask for payment bank during order 2014-12-21 10:32:11 +01:00
Frédéric FRANCE
6f4ba2552d Typo on conf variable 2014-12-21 10:14:51 +01:00
Laurent Destailleur
22c27e8703 PHPCS 2014-12-21 02:21:12 +01:00
Laurent Destailleur
268723be7b Fixed: sql syntax error 2014-12-21 01:39:20 +01:00
Laurent Destailleur
c05c2fe427 Info to help debug perf pb. 2014-12-20 18:46:29 +01:00
Laurent Destailleur
74d5e11831 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-12-20 15:42:30 +01:00
Laurent Destailleur
8996953077 Fix: error reported by scrutinizer 2014-12-20 15:42:03 +01:00
Laurent Destailleur
b0ae8cfb9e Merge pull request #2161 from fappels/3.7 
FIX: check for expedition batch lines
 2014-12-20 13:20:24 +01:00
Laurent Destailleur
c9f3267649 Fixed: bad conditions 2014-12-20 11:34:37 +01:00
Laurent Destailleur
854ed90a62 Fixed: bad place for the ajaxcombo. 2014-12-20 11:15:10 +01:00
Laurent Destailleur
d8838f9438 Update codesniffer to remove travis errors. 2014-12-20 00:11:43 +01:00
Laurent Destailleur
748b076d61 Merge remote-tracking branch 'origin/3.6' into 3.7 2014-12-19 19:11:06 +01:00
Laurent Destailleur
789d588fde Update codesniffer to remove travis errors. 2014-12-19 19:10:41 +01:00
Laurent Destailleur
0bb431c4d0 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	dev/codesniffer/ruleset.xml
 2014-12-19 19:03:05 +01:00
Laurent Destailleur
47cab90336 Update codesniffer to remove travis errors. 2014-12-19 19:01:29 +01:00
Laurent Destailleur
c120e7b3df Clean deprecated files. 
Add utility tool
 2014-12-19 16:10:11 +01:00
Laurent Destailleur
c163223957 Moved vagrant dir into obsolete repo 2014-12-19 12:39:20 +01:00
Francis Appels
747b2af06b FIX: check for expedition batch lines 
check if expedition batch lines are available before foreach
 2014-12-19 11:57:47 +01:00
Laurent Destailleur
c571013fc9 Merge remote-tracking branch 'origin/3.6' into 3.7 2014-12-18 23:55:07 +01:00
Laurent Destailleur
3debf56c68 Update phpcs 2014-12-18 23:54:39 +01:00
Laurent Destailleur
3c24c1b11a Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-12-18 23:53:39 +01:00
Laurent Destailleur
b1c4d32fbf Update phpcs file 2014-12-18 23:53:17 +01:00
Juanjo Menent
57918fe4f6 Trad: Update es_ES from transifex 2014-12-18 23:02:21 +01:00
Juanjo Menent
229e87adc1 Trad: Update es_ES from transifex 2014-12-18 22:35:59 +01:00
Laurent Destailleur
7ad1553859 Merge pull request #2160 from FHenry/3.6 
[ bug #1749 ] Undefined $mailchimp
 2014-12-18 22:35:45 +01:00
Florian HENRY
6f43206331 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-12-18 15:42:44 +01:00
Florian HENRY
c209d16881 [ bug #1749 ] Undefined $mailchimp 2014-12-18 15:42:28 +01:00
Laurent Destailleur
38ba6ac75b Fixed: pgsql to make order 2014-12-18 11:48:30 +01:00
Laurent Destailleur
ef5035b349 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/product/liste.php
 2014-12-18 11:42:55 +01:00
Laurent Destailleur
2c01a46774 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/paypal/lib/paypal.lib.php
 2014-12-18 10:13:25 +01:00