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

47654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
c33cbefad2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-15 11:16:29 +02:00
Laurent Destailleur
4931401188 Fix new pagination style was not working correctly. 2015-05-15 04:33:01 +02:00
Laurent Destailleur
7b2230e437 Merge pull request #2774 from aspangaro/develop-pagination 
NEW Use larger button for navigation
 2015-05-15 03:57:29 +02:00
Laurent Destailleur
34fb863fc5 Merge pull request #2831 from aspangaro/develop-md 
Md_exp: Deactivate gradient into div.liste_titre & Attenuate lines #ddd -> #f4f4f4
 2015-05-15 03:53:23 +02:00
Laurent Destailleur
49a13f5e72 Debug of module expense report 2015-05-15 03:52:29 +02:00
Laurent Destailleur
17b736c8ce Merge branch 'aspangaro-develop-ER_badge' into develop 2015-05-15 02:44:56 +02:00
Laurent Destailleur
3f5215169a Merge branch 'develop-ER_badge' of https://github.com/aspangaro/dolibarr 
into aspangaro-develop-ER_badge

Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php
 2015-05-15 02:44:43 +02:00
Laurent Destailleur
bf883e1576 Minor cosmetic changes 
Fix permissions and CRLF
 2015-05-15 02:34:57 +02:00
Laurent Destailleur
60863d5d9d Enhance tool to report duplicate and not used language keys. 2015-05-15 02:28:42 +02:00
Bahfir Abbes
ffc5284a78 Update listevents.php 2015-05-14 20:17:52 +01:00
Laurent Destailleur
6d95de48c2 Css fixes 2015-05-14 20:49:22 +02:00
Laurent Destailleur
3e94cc07d2 Fight against valign="top". Minor css fixes. 2015-05-14 16:47:15 +02:00
Laurent Destailleur
74607218ea Fight against key tva_taux. Removed completely. 2015-05-14 15:59:09 +02:00
Laurent Destailleur
33b9d492e2 Clean code 2015-05-14 15:43:07 +02:00
aspangaro
766c58724a ER: Review & add a totalVAT in pdf 2015-05-14 08:26:41 +02:00
aspangaro
bba0349ab6 ER: traduce code 2015-05-14 07:36:48 +02:00
aspangaro
81cf7a3d25 Merge remote-tracking branch 'Upstream/develop' into develop-md 2015-05-14 06:42:28 +02:00
Juanjo Menent
7c9bb10d6b Merge pull request #2826 from tysauron/patch-1 
Update list.php
 2015-05-13 21:27:01 +02:00
Juanjo Menent
3d1c0752d3 Merge pull request #2825 from fentman/patch-1 
Provide NotFound and Error return values
 2015-05-13 21:23:56 +02:00
Juanjo Menent
e3e6cff713 Merge pull request #2815 from bafbes/patch-4 
Fix forgotten last contributor information to list.php Update
 2015-05-13 21:16:16 +02:00
Juanjo Menent
d65721bb20 Insert option to use old system storage photos only if the first 
installation was done with a version < 3.7.0
 2015-05-13 20:34:57 +02:00
Bahfir Abbes
5191bffb1c improve events list view 
provide a finer grained view for this list and fix bug related to sorting control which wipes off other parameters
 2015-05-13 18:56:13 +01:00
Laurent Destailleur
5937cd7f70 NEW Forms are using the tab look, even in creation mode. 2015-05-13 17:53:25 +02:00
tysauron
84935336ee Update list.php 
Bug pagination du bas quand recherche
 2015-05-13 17:04:35 +02:00
Laurent Destailleur
b327b5fb9d Save regressions 2015-05-13 09:32:54 +02:00
Laurent Destailleur
43b5209192 NEW Clean code into salary module, debug and add indexes 
NEW Can filter on user list and salary payments on user with naural
search.
 2015-05-13 08:57:39 +02:00
Laurent Destailleur
8e09f54a46 Minor fixes 2015-05-13 07:46:12 +02:00
Michael Fenton
83e7c8a065 Provide NotFound and Error return values 
Providing a Not Found Message when a Third Party entity is not found to match with details provided, and providing an Error Message when the SQL Lookup fails.

This will help Asterisk Users determine whether the CallerID would be usable from Dolibarr or to reject and continue with existing CID from Asterisk
 2015-05-13 11:20:06 +10:00
Laurent Destailleur
1af2459d90 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-05-12 23:47:49 +02:00
Laurent Destailleur
b0d73ee674 FIX Bad link to login page into email for password renewal. 2015-05-12 23:47:28 +02:00
Laurent Destailleur
81d2d12035 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-12 23:40:57 +02:00
Laurent Destailleur
ce0d728438 Merge pull request #2813 from bafbes/patch-3 
Update html.formfile.class.php
 2015-05-12 23:02:45 +02:00
Laurent Destailleur
39b4fc6455 Renamed readme file 2015-05-12 22:59:17 +02:00
Laurent Destailleur
0bf7dd0686 Merge pull request #2824 from atm-maxime/3.7 
Fix : bad link when sorting shipment list #2823
 2015-05-12 22:42:17 +02:00
Maxime Kohlhaas
942564be56 Fix : bad link when sorting shipment list #2823 2015-05-12 22:36:34 +02:00
Laurent Destailleur
f8e8fe6f34 Merge pull request #2816 from marcosgdf/bug-2757 
Close bug #2757 Deleting product category photo gives "Forbidden access" error
 2015-05-12 22:36:33 +02:00
Laurent Destailleur
4408648a68 Merge pull request #2817 from GPCsolutions/jqueryfixes 
jQuery fixes
 2015-05-12 22:36:12 +02:00
Laurent Destailleur
b3c9c3d91b Merge pull request #2818 from GPCsolutions/htmlfixes 
HTML fixes
 2015-05-12 22:34:35 +02:00
Laurent Destailleur
b99d2a8276 Merge pull request #2819 from GPCsolutions/typehinting 
[Qual] Typehinting
 2015-05-12 22:34:06 +02:00
Florian HENRY
8e61a03b5c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-12 21:02:36 +02:00
Raphaël Doursenaud
3b9388e57f Added typehinting to resultsets in database drivers 2015-05-12 19:51:41 +02:00
Raphaël Doursenaud
6558c0f1f2 Removed a bunch of unused variables 2015-05-12 19:47:15 +02:00
Raphaël Doursenaud
3fdc4ca5e0 Better type hinting for the SQLite3 database driver 2015-05-12 19:45:14 +02:00
Laurent Destailleur
cb6f23d9b6 Merge pull request #2771 from aternatik/api_rest 
Add new core module : REST API
 2015-05-12 19:39:37 +02:00
Raphaël Doursenaud
70d36dd1e3 Better type hinting for the SQLite database driver 2015-05-12 19:30:04 +02:00
Raphaël Doursenaud
67641280a4 Fixed parameter types 2015-05-12 19:16:29 +02:00
Raphaël Doursenaud
1fdff27184 Fixed type hintings 2015-05-12 19:11:12 +02:00
Raphaël Doursenaud
053f6ae494 [Qual] Fixed missing return statements 2015-05-12 19:10:47 +02:00
Raphaël Doursenaud
27d52cf2b0 Better type hinting for DoliDB 2015-05-12 19:01:01 +02:00
Raphaël Doursenaud
ccd14c8305 Better type hinting and code structure for the PgSQL database driver 2015-05-12 18:31:12 +02:00