lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,023 Commits 43 Branches 150 Tags 886 MiB
4bbf16e277
Commit Graph

45023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
4bbf16e277 Merge pull request #2178 from frederic34/patch-10 
Add css badge
 2014-12-25 23:25:30 +01:00
Laurent Destailleur
2c350d1cc8 Merge pull request #2179 from frederic34/patch-11 
Add css badge
 2014-12-25 23:19:14 +01:00
Laurent Destailleur
40404530ba Fixed: [ bug #1756 ] PHP error while removing an import profile 2014-12-25 12:09:00 +01:00
Laurent Destailleur
bd7f6339ce 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-25 12:08:35 +01:00
Laurent Destailleur
dc4a874e70 Fixed: [ bug #1690 ] Sorting on salary table triggers SQL errors 2014-12-25 12:08:10 +01:00
Laurent Destailleur
08fd74e79e Fix: [ bug #1687 ] The ref filter searches on ref and rowid in supplier 
invoices list
 2014-12-25 12:07:27 +01:00
Laurent Destailleur
2c170dbe0e Fixed: Do not show disabled user when creating a new event. 2014-12-25 12:04:39 +01:00
Laurent Destailleur
34ef373b3a Fixed: Filter lost with navigation 2014-12-25 12:00:49 +01:00
Juanjo Menent
73b47427d8 Update ChangeLog 2014-12-24 15:41:11 +01:00
Juanjo Menent
65eef3587a Merge pull request #2166 from defrance69/patch-36 
Update functions.lib.php
 2014-12-24 15:38:48 +01:00
Marcos García de La Fuente
ee1bc22e79 Fix: [ bug #1722 ] Missing link in homepage project's box 2014-12-24 14:42:47 +01:00
Marcos García de La Fuente
294753dc47 Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some 
masks

Conflicts:
	htdocs/core/lib/functions2.lib.php
 2014-12-24 14:32:25 +01:00
Frédéric FRANCE
7001cd0283 Update index.php 2014-12-23 20:11:13 +01:00
Frédéric FRANCE
6b29c8e5c6 Update index.php 2014-12-23 19:06:51 +01:00
BENKE Charles
b45bd06475 Update functions.lib.php 
Add feature to limit the number of tabs in a card (based on google menu practice)
function actived with MAXTABS_IN_CARD dictionnary
watch result here : http://www.dolibarr.fr/forum/12-howto--aide/52135-tuto-ajouter-a-un-doc-pdf-un-extrafields#56008
or here.
All the code is in one function, need to explode/refactoring it on diferent css
 2014-12-22 12:26:04 +01:00
Laurent Destailleur
8e613764c5 Merge pull request #2165 from defrance69/patch-35 
Patch 35
 2014-12-22 09:53:36 +01:00
Laurent Destailleur
2a3bb96c34 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ecm.lib.php
 2014-12-22 03:14:22 +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
90d275bd20 Fix comment 2014-12-22 02:53:55 +01:00
Laurent Destailleur
c9db04985e Update image for menu 2014-12-22 02:53:33 +01:00
Laurent Destailleur
a519df5d00 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2014-12-22 01:43:20 +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
BENKE Charles
7cca53ed04 Update style.css.php 2014-12-21 14:26:46 +01:00
BENKE Charles
e802b934fa Update style.css.php 2014-12-21 14:26:22 +01:00
BENKE Charles
7e9596c971 Update style.css.php 2014-12-21 14:25:54 +01:00
BENKE Charles
932fadbdbd Update style.css.php 
harmonisation with eldy theme for tabs feature
 2014-12-21 14:24:55 +01:00
Laurent Destailleur
bdb47921e7 Fixed: Bad value for % increase for first year. 2014-12-21 14:15:36 +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
348e829594 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-20 14:27:14 +01:00
Laurent Destailleur
98019dd526 Enhance scrutinizer 2014-12-20 14:26:58 +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
cea500ef80 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
 2014-12-20 13:06:08 +01:00
Laurent Destailleur
2d040e51f8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-20 11:36:52 +01:00
Laurent Destailleur
c9f3267649 Fixed: bad conditions 2014-12-20 11:34:37 +01:00
Laurent Destailleur
27f26bba27 Fixed: Missing test 2014-12-20 11:17:04 +01:00
Laurent Destailleur
854ed90a62 Fixed: bad place for the ajaxcombo. 2014-12-20 11:15:10 +01:00
Laurent Destailleur
5bcb195c15 Update codesniffer to remove travis errors. 2014-12-20 00:14:53 +01:00
Laurent Destailleur
d8838f9438 Update codesniffer to remove travis errors. 2014-12-20 00:11:43 +01:00
Laurent Destailleur
78ef12cc0d Merge remote-tracking branch 'origin/3.7' into develop 2014-12-19 19:12:05 +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