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

48152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexis Algoud
91885c9d6f FIX when multicompany was enabled, this function didn't check just on the good entity (problem when both company use same mask) 2015-05-22 17:22:57 +02:00
Laurent Destailleur
fe2329518b Merge pull request #2877 from atm-ph/fix_37_update_usergroup 
FIX : update usergroup name
 2015-05-22 17:21:42 +02:00
Laurent Destailleur
0b40502878 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2015-05-22 17:14:53 +02:00
Laurent Destailleur
dcc197eb6b Fix bug debian 786479 2015-05-22 17:13:32 +02:00
Laurent Destailleur
2f5d1f5965 Merge pull request #2842 from atm-alexis/fix_email_cc_in_selectlist_on_propal 
Fix email cc in selectlist on propal/bill
 2015-05-22 16:56:53 +02:00
Laurent Destailleur
4de46892d1 Merge pull request #2872 from atm-alexis/fix_button_create_payment_on_social_tax_less_than_1euro 
FIX button create payment hide if tax amount is less than 1
 2015-05-22 16:53:49 +02:00
Laurent Destailleur
9c9afc0a93 Merge pull request #2876 from atm-maxime/3.6 
Fix : facturestats was not filtering on invoice type
 2015-05-22 16:52:34 +02:00
phf
b9ed61eed4 FIX : update usergroup name 2015-05-22 16:46:28 +02:00
Laurent Destailleur
995a2c127d Working on finishing of look 2015-05-22 15:29:19 +02:00
Laurent Destailleur
390c7d8e65 Fix link to prospect with filter on commercial status 
Enhance natural_search method to allow to search on several ids.
 2015-05-22 15:19:27 +02:00
Laurent Destailleur
4319cd63a3 Working on finishing of look 2015-05-22 14:28:02 +02:00
Laurent Destailleur
97ba2cf0e9 Replace ol icon for delete with new one 2015-05-22 12:21:55 +02:00
Laurent Destailleur
6f5a30638c NEW On page to see/edit contact of an ojbect, the status of contact is 
visible (for both external and internal users).
 2015-05-22 12:21:36 +02:00
Maxime Kohlhaas
ff6708840d Fix : facturestats was not filtering on invoice type 2015-05-22 09:23:28 +02:00
Alexis Algoud
81a919e8a3 round to price2num 2015-05-22 09:05:38 +02:00
Laurent Destailleur
f35c41cc7e Introduce hidden option "MAIN_FIX_FLASH_ON_CHROME" to solve a strange 
behaviour of chrome making page to be flashed before rendered.
 2015-05-22 01:48:36 +02:00
Laurent Destailleur
6108dfad55 Minor enhancement 2015-05-22 00:46:53 +02:00
Laurent Destailleur
9cf8d6f595 Merge pull request #2874 from atm-maximep/fix_table_design 
FIX #2856 : Wrong table design
 2015-05-21 21:53:13 +02:00
Laurent Destailleur
fb923c0c2b Merge pull request #2867 from aspangaro/develop-resource 
NEW Forms are using the tab look, even in creation mode
 2015-05-21 21:33:42 +02:00
Laurent Destailleur
8244d1bd44 Merge pull request #2869 from atm-alexis/fix_event_for_user_restricted_if_no_company 
FIX event for restricted user was restricted if company null
 2015-05-21 21:25:20 +02:00
Laurent Destailleur
3b70013cf9 Merge pull request #2871 from GPCsolutions/dolibarr-2870 
Dolibarr 2870
 2015-05-21 21:24:28 +02:00
Laurent Destailleur
a09563435b Merge pull request #2840 from FHenry/develop 
NEW : add date value filter on account records list
 2015-05-21 21:22:31 +02:00
Laurent Destailleur
f32215a9fc Merge pull request #2866 from GPCsolutions/3.5-2857 
Properly escape untrusted data to prevent HTML injection.
 2015-05-21 21:10:02 +02:00
Laurent Destailleur
9e344bf267 Merge pull request #2875 from fappels/develop 
Qual: Remove unused pages
 2015-05-21 20:56:06 +02:00
Francis Appels
793f68dc96 Qual: Remove unused pages 
Remove unused but maintained pages which contain errors and deadlinks.
 2015-05-21 20:13:41 +02:00
maxime peyrot
bcb4754585 FIX #2856 : Wrong table design 2015-05-21 17:40:36 +02:00
Alexis Algoud
9184b08f94 FIX button create payment hide if tax amount is less than 1 2015-05-21 16:51:21 +02:00
Raphaël Doursenaud
fc88df9ddf Fixed typo 2015-05-21 16:33:38 +02:00
Raphaël Doursenaud
38a9f6edae Drop deprecated fields 
Fix #2870
 2015-05-21 16:32:46 +02:00
Arnaud Aujon
6d5555948e Merge remote-tracking branch 'upstream/develop' into 3.7-webservices-fix 
Conflicts:
	test/phpunit/WebservicesInvoicesTest.php
 2015-05-21 13:11:41 +02:00
Alexis Algoud
bc672c2c23 FIX event for restricted user was restricted if company null 2015-05-21 11:49:10 +02:00
Laurent Destailleur
e075fce5eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-21 01:33:16 +02:00
Laurent Destailleur
90f9a845ae Enhance style 2015-05-21 01:32:56 +02:00
aspangaro
e23459d53b NEW Forms are using the tab look, even in creation mode 2015-05-20 21:50:38 +02:00
Raphaël Doursenaud
a7f6bbd316 Properly escape untrusted data to prevent HTML injection. 
First pass for #2857
 2015-05-20 17:34:00 +02:00
Marcos García de La Fuente
9ebae9520a Extrafields does not form part of this class 2015-05-20 16:46:12 +02:00
Marcos García de La Fuente
e24a8b4505 Closed bug #2843 Wrong SQL table called 2015-05-20 16:43:44 +02:00
Laurent Destailleur
f0cfa3406c Merge pull request #2852 from aspangaro/develop-resource 
NEW Forms are using the tab look, even in creation mode
 2015-05-20 15:27:08 +02:00
Laurent Destailleur
0f89164f4f Merge pull request #2849 from aspangaro/develop-ER_listlimit 
Fix: ER list don't respect $conf->liste_limit
 2015-05-20 15:26:34 +02:00
Laurent Destailleur
439b416daf Merge pull request #2846 from fappels/3.6 
Fix: SQL error in facturestats on no view rights
 2015-05-20 15:26:09 +02:00
Laurent Destailleur
a49c6bce66 Merge pull request #2844 from tysauron/patch-3 
For backward compatibility ON update actioncomm
 2015-05-20 15:24:32 +02:00
Laurent Destailleur
4d35939d77 Merge pull request #2850 from aspangaro/develop-adherent 
Members: Review (Add background in create mode / Add button cancel / move type tab in member.lib)
 2015-05-20 15:24:09 +02:00
Laurent Destailleur
55b9d97081 Fix PHPCS 2015-05-20 15:22:59 +02:00
Laurent Destailleur
a05510c9df Merge pull request #2845 from tysauron/patch-2 
Bug : Declaration of CompanyBankAccount::create() should be compatibl…
 2015-05-20 15:19:42 +02:00
Laurent Destailleur
0e837f7540 Merge pull request #2848 from aspangaro/develop-md 
Add pagination style in every template
 2015-05-20 15:18:44 +02:00
Laurent Destailleur
faaa01d3de Merge pull request #2851 from aspangaro/develop-donation 
Fix: spaces  
 2015-05-20 15:18:22 +02:00
Florian HENRY
0331ddc2de fix spacing 2015-05-20 11:30:27 +02:00
Florian HENRY
df4ee9562f fix spell 2015-05-20 11:29:35 +02:00
Florian HENRY
8fa3b8dac3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-20 11:24:49 +02:00
Florian HENRY
6e6b66e416 apply recommandation from 
ca53d3b602 (commitcomment-11245627)
 2015-05-20 11:24:23 +02:00