Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
41,866 Commits 36 Branches 189 Tags
4b9d1b901bccd39b6cd8967ae13b84f8221b0e00
Commit Graph

191 Commits

Author SHA1 Message Date
Alexis Algoud
197ff1a653 Add detailled view in supplier order as in customer order 2014-05-12 12:10:53 +02:00
Laurent Destailleur
f95c87f1d6 Fix: [ bug #1374 ] Salaries module requires "Special costs" module to 
work but it does not enable it
 2014-05-10 18:57:04 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
71ca269c71 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/menus/standard/eldy.lib.php
 2014-04-25 20:29:29 +02:00
Laurent Destailleur
196cf53dbd Fix: Pb of return values 2014-04-25 20:11:38 +02:00
Raphaël Doursenaud
96c0c43404 Qual: Missing global declaration 2014-04-23 18:24:02 +02:00
Raphaël Doursenaud
d717133d62 Qual: Removed dead code 2014-04-23 18:24:02 +02:00
Raphaël Doursenaud
b68fb41d28 Qual: Wrong type in method documentation 2014-04-23 18:24:02 +02:00
Raphaël Doursenaud
1c3c20105e Qual: Wrong type in method documentation 2014-04-23 18:24:02 +02:00
Raphaël Doursenaud
aa5d0b37b7 Qual: Wrong type in method documentation 2014-04-23 18:23:58 +02:00
Laurent Destailleur
c1e349d110 Experiment hidden option MAIN_MENU_INVERT 2014-04-23 12:22:01 +02:00
Laurent Destailleur
56c7d14b9a We do not force disabling of ckeditor for phones. We let ckeditor 
decide (currently ckeditor is disabled with android).
 2014-03-31 13:25:40 +02:00
Laurent Destailleur
80088c87ac Fix: Some debugs of module categories 2014-03-18 00:20:39 +01:00
Laurent Destailleur
2889c3ac70 Qual: Feature to make payment of salaries has been moved into a module 
(module dedicated to manage salaries and salary payments).
Qual: Also module for employee to declare trip and expenses has been
moved into same place than module for employee to declare holidays
(into HRM top entry). It is not an accountancy module so no reason to
have it into entry "Accountancy".
 2014-03-17 14:30:55 +01:00
aspangaro
5175dcf135 Update also eldy menu 2014-03-16 20:17:25 +01:00
aspangaro
048b3c01ce Add salary payment in tax module - Link to user. 
Necessary for future hrm module.
 2014-03-06 21:21:16 +01:00
Laurent Destailleur
2e67bbc382 Maxi debug of barcode feature. 
New: Barcode format and mandatory requirement is checked.
New: Start to add new page for barcode init.
 2014-02-19 01:51:19 +01:00
Laurent Destailleur
03d056319c Qual: Clean code for adding menu entries into Modules system admin 
entry.
New: Add entry for admin page Mass barcode init.
 2014-02-18 20:49:22 +01:00
Laurent Destailleur
860ca15cfc Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2014-02-17 15:27:30 +01:00
Laurent Destailleur
de64ce5b2a Fix: user right on Holiday for month report nor working 2014-02-17 00:09:48 +01:00
Grand Philippe
1855ba556a fix misspelled words 2014-02-05 17:53:30 +01:00
Laurent Destailleur
0e3184c436 Fix: W3C. 
Fix: Permission on a button.
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/societe/soc.php

Fix: Some menu entry not visible.
 2014-01-06 17:17:57 +01:00
Laurent Destailleur
555170e573 Fix: W3C. 
Fix: Permission on a button.
Fix: Some menu entry not visible.
 2014-01-06 17:14:13 +01:00
Laurent Destailleur
0e819ab5cd Fix: Missing test 2013-12-07 16:43:35 +01:00
Laurent Destailleur
d57aa65d30 Fix: Add option to fix warning not visible when there is preactivated 
modules
 2013-11-13 18:45:36 +01:00
Laurent Destailleur
d542576d23 Fix: Menu entry into getmenu_div is clicable on all line. 2013-10-22 18:43:57 +02:00
Laurent Destailleur
305ca25267 New: Add menu entry to page massstockmove.php 2013-10-20 14:05:51 +02:00
Laurent Destailleur
f4a83f0851 Qual: Debug of replenishment feature 2013-10-09 20:30:49 +02:00
Laurent Destailleur
e970c01b1b Code comment 
Fix translation
 2013-09-15 12:17:45 +02:00
Regis Houssin
841961df4e Fix: wrong function name 2013-08-27 14:53:24 +02:00
Grand Philippe
7a64ad1a26 some fix for contract model and clean code 2013-08-26 14:29:46 +02:00
Laurent Destailleur
c1dae58055 Fix: Bad translation (to pick to 3.4) 2013-08-22 12:46:10 +02:00
Laurent Destailleur
b7cada9a99 Fix: End of menu when no module selected. 2013-08-06 03:01:56 +02:00
Cédric Salvador
0e77b273df copyright 2013-07-29 12:31:06 +02:00
Cédric Salvador
da5bbd0a08 moved page + added link in the left menu 2013-07-29 12:31:06 +02:00
Laurent Destailleur
0743521b6b - No need to load css of plugin fileupload (plugin never loaded). Too 
much bugged to be included by default.
- Vertical menu must be under horizontal menu, even if horizontal menu
is wrapped.
- Add an empty li at end of list to provide more options for skins.
 2013-07-28 05:35:51 +02:00
Laurent Destailleur
c4d3307bfa Qual: Normalize file name. 2013-07-26 11:36:36 +02:00
Laurent Destailleur
71634a0c76 Fix: Add missing css style 2013-07-23 18:36:18 +02:00
Florian Henry
1a8377d847 Add category contact into left menu entry 2013-07-21 10:47:55 +02:00
Laurent Destailleur
5706779c8b New: Add a page on performance advice 2013-07-09 13:50:20 +02:00
Laurent Destailleur
7c163f7be3 Fix: Running fixdosfile onto all project 2013-07-07 13:17:48 +02:00
Laurent Destailleur
7b5e0678db New: Make some changes to allow usage of alternative 
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
 2013-07-07 03:26:51 +02:00
Laurent Destailleur
af4651f1a2 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/perl/virtualmin/dolibarr.pl
	htdocs/core/lib/files.lib.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/webservices/server_other.php
 2013-06-25 23:22:00 +02:00
Laurent Destailleur
8359a34545 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
 2013-06-25 21:31:24 +02:00
Laurent Destailleur
2af8f295b1 Fix: warning not always visible. Depends if addon modules were 
installed. Var should provide a quick fix.
 2013-06-25 21:25:09 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Laurent Destailleur
570275cd76 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/opensurvey.lang
	htdocs/opensurvey/public/index.php
 2013-06-21 15:37:17 +02:00
Laurent Destailleur
ec2e4c8a8b Fix: parenthesis at wrong place 2013-06-19 22:58:35 +02:00
Laurent Destailleur
aaad4d3474 Fix: Menu cheque depends on bank module and not invoice. 2013-06-19 19:52:20 +02:00
Laurent Destailleur
5cb2ba3909 Several fixes in CSS 
Conflicts:
	htdocs/core/menus/standard/empty.php
 2013-06-19 17:02:09 +02:00