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

47937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BENKE Charlie
d16bfcc294 adding hook for more action buttons 
allow additionnal hook action (like myField)
 2015-05-26 15:00:23 +02:00
phf
087b026f54 Add fetch extrafields in contact's fetch function 2015-05-26 12:40:49 +02:00
atm-ph
74c4db0f57 Remove comment 
This comment is false, my $_SESSION was wrong
 2015-05-26 11:23:25 +02:00
Francis Appels
b9c3dec141 Fix: issue #2859 unit form select 2015-05-26 11:14:15 +02:00
phf
3c0da7e2d7 FIX : extrafields required on thirdparty 2015-05-26 10:54:31 +02:00
Arnaud Aujon
23936827a8 Merge remote-tracking branch 'upstream/develop' into 3.7-webservices-fix 2015-05-26 10:54:30 +02:00
Laurent Destailleur
afd7366459 Css 2015-05-26 09:22:34 +02:00
Laurent Destailleur
bf334d8711 NEW Thumbs for statistics on main page are fully clicable (not only link 
inside the thumb)
 2015-05-26 09:13:48 +02:00
Laurent Destailleur
06faf762d4 Merge pull request #2865 from marcosgdf/bug-2843 
Closed bug #2843 Wrong SQL table called
 2015-05-25 19:34:33 +02:00
abb
f9aec93d73 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2015-05-25 18:30:53 +01:00
Laurent Destailleur
cb0b0fba7c Merge pull request #2897 from atm-ph/fix_37_create_contact 
FIX : create contact with extrafiel is null when it is require
 2015-05-25 19:28:17 +02:00
Laurent Destailleur
76380c2288 Merge pull request #2898 from defrance69/patch-62 
Tabs collector better identification
 2015-05-25 19:27:39 +02:00
Laurent Destailleur
0321257fbe Merge pull request #2887 from GPCsolutions/dolibarr-2886 
Deprecation of the mysql driver
 2015-05-25 18:50:40 +02:00
Laurent Destailleur
a4164a6656 Merge pull request #2883 from bafbes/develop 
Fix non existing "supplier invoice setting to draft" trigger
 2015-05-25 18:49:57 +02:00
Laurent Destailleur
c2decc8aea Merge pull request #2895 from atm-ph/fix_37_balise_script 
FIX : "script" balise with wrong syntax
 2015-05-25 18:49:15 +02:00
Laurent Destailleur
c8949d0532 Some doxygen fixes 2015-05-25 18:43:46 +02:00
Laurent Destailleur
0dae63c5b5 Merge pull request #2894 from swbraun/2847fix 
fixes #2847
 2015-05-25 18:18:47 +02:00
BENKE Charlie
a30d4d4be6 Tabs collector better identification 
Tabs collector goes wrong with 2 tabs in the same page (like projet and task), so we use picto name to identify the 2 tabscollect
We need to substract the @ if the tabs is from a module... eg : factory@factory
 2015-05-25 18:14:49 +02:00
Laurent Destailleur
11d4a945b0 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/contact/list.php
	htdocs/contrat/liste.php
	htdocs/product/liste.php
 2015-05-25 18:08:23 +02:00
Laurent Destailleur
a33809a526 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/comm/propal.php
	htdocs/compta/facture.php
 2015-05-25 17:46:42 +02:00
phf
7b163d3b29 FIX : create contact with extrafiel is null when it is require 2015-05-25 17:36:36 +02:00
Raphaël Doursenaud
ec2035a73e Allow usage of contact extrafield element type 
As documented in the methods comments
 2015-05-25 17:19:27 +02:00
phf
33ad86261a FIX : width multiselect 2015-05-25 16:42:51 +02:00
phf
a5f2617166 FIX : "script" balise with wrong syntax 2015-05-25 15:52:41 +02:00
Marcos García de La Fuente
c0346bcba4 Fixed typo 2015-05-25 14:59:34 +02:00
Steve Braun
d1c7c9489e fixes #2847 2015-05-25 14:56:37 +02:00
Marcos García de La Fuente
8627f2f19b Removed innecesary test 2015-05-25 14:01:15 +02:00
root
bbf06cf2d7 Merge remote-tracking branch 'upstream/develop' into 3.7-webservices-fix 2015-05-25 09:26:21 +02:00
Juanjo Menent
5ddcfce908 Merge pull request #2890 from GPCsolutions/categories-types 
Include Categories class whenever Categorie::TYPE is used
 2015-05-24 11:38:09 +02:00
abb
5358d11cd7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2015-05-24 09:07:10 +01:00
Alexis ALGOUD
44c46d68ed Remove the useless if 2015-05-23 23:51:49 +02:00
Raphaël Doursenaud
becc240b92 Include Categories class whenever Categorie::TYPE is used 2015-05-23 23:35:49 +02:00
Raphaël Doursenaud
c018858e91 Deprecation of the mysql driver 
Fix #2886
 2015-05-23 20:43:21 +02:00
Juanjo Menent
55b7dab292 Merge pull request #2884 from GPCsolutions/categories-types 
Added types constants to categories
 2015-05-23 19:09:07 +02:00
Raphaël Doursenaud
ee808cdfd7 Added types constants to categories 2015-05-23 18:52:31 +02:00
Juanjo Menent
e9d58c06a2 Merge pull request #2882 from GPCsolutions/dolibarr-2881 
Make select_salesrepresentative() return 0 when empty
 2015-05-23 17:22:59 +02:00
Juanjo Menent
9ccc577101 Merge pull request #2880 from GPCsolutions/dolibarr-2879 
Remove duplicate modify button on user's card
 2015-05-23 17:16:28 +02:00
Raphaël Doursenaud
139b41c014 Make select_salesrepresentative() return 0 when empty 
Fix #2881
 2015-05-23 16:38:59 +02:00
abb
ebf2edf019 added new trigger for supplier invoice unvalidation "BILL_SUPPLIER_UNVALIDATE" in set_draft class function 2015-05-23 15:35:19 +01:00
abb
879c82ee0a added new trigger for supplier invoice unvalidation "BILL_SUPPLIER_UNVALIDATE" in trigger demo file 2015-05-23 15:28:51 +01:00
abb
4e48f24507 added new trigger for supplier invoice unvalidation "BILL_SUPPLIER_UNVALIDATE" in Database 2015-05-23 15:12:24 +01:00
abb
ba68598ec7 added new trigger for supplier invoice unvalidation in Agenda 2015-05-23 15:09:44 +01:00
Raphaël Doursenaud
5fe31e90c8 Remove duplicate modify button on user's card 
Fix #2879
 2015-05-23 15:32:09 +02:00
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