Commit Graph

47937 Commits

Author SHA1 Message Date
Laurent Destailleur
07ae39fc38 Merge pull request #2910 from aspangaro/develop-patch21
Fix: wrong link
2015-05-30 15:00:30 +02:00
Laurent Destailleur
920dc80dd6 Merge pull request #2908 from defrance69/patch-63
NEW Add hook for more action buttons on product supplier page
2015-05-30 14:59:58 +02:00
Laurent Destailleur
13b78f9c17 NEW Add gender property managed on user card
FIX Better error messages when uploading photo of user when permission
to write are not granted
2015-05-30 02:17:05 +02:00
Laurent Destailleur
6701b399ae Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-30 00:26:47 +02:00
abb
1048bd1ba4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2015-05-29 22:11:00 +01:00
abb
3c8d37cb05 fix 600 first lines of arabic language admin file 2015-05-29 22:03:06 +01:00
Raphaël Doursenaud
bbd0b89087 Added tags/categories management to customers
Customers part of #2571
2015-05-29 18:50:43 +02:00
Raphaël Doursenaud
074fcd9769 Standardize categories types/ids management
Fix #2922
Fix #2843
2015-05-29 17:51:34 +02:00
Laurent Destailleur
2fb44caedb Merge pull request #2906 from atm-ph/fix_37_fetch_contact
FIX : Compare array_options with oldcopy
2015-05-29 17:41:38 +02:00
phf
9f52b9e800 FIX : #2901 2015-05-29 17:27:05 +02:00
Laurent Destailleur
888bec2df3 Merge pull request #2904 from fappels/develop
FIX #2859 HTML units selector
2015-05-29 17:21:32 +02:00
Laurent Destailleur
abcd7ae667 Merge pull request #2903 from atm-ph/fix_37_thirdparty_extrafield
FIX : extrafields required on thirdparty
2015-05-29 17:19:20 +02:00
Laurent Destailleur
0ab3cd03c0 Merge pull request #2896 from GPCsolutions/extrafieldcontacttype
Allow usage of contact extrafield element type
2015-05-29 17:18:25 +02:00
Laurent Destailleur
4324ed82b3 Merge pull request #2878 from atm-alexis/fix_multientity_num_check
FIX when multicompany was enabled, isExistingObject check wrong
2015-05-29 17:16:32 +02:00
Laurent Destailleur
58dbfd38a9 Merge pull request #2926 from hregis/develop_origin
Fix: possibility to shared facnumber between entities
2015-05-29 17:16:02 +02:00
Laurent Destailleur
11552e90b7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-29 17:15:27 +02:00
phf
81b6655940 Merge branch '3.7' of https://github.com/Dolibarr/dolibarr into 3.7 2015-05-29 17:13:03 +02:00
Laurent Destailleur
65c7ab7a93 Fix: Introduce error by default when function is used as a true delete
function.
2015-05-29 17:11:42 +02:00
Laurent Destailleur
92440d125b Merge pull request #2928 from Dolibarr/revert-1446-removefiles
Revert "Made test pessimistic by default"
2015-05-29 17:10:02 +02:00
Laurent Destailleur
d925ecb4f1 Revert "Made test pessimistic by default" 2015-05-29 17:09:35 +02:00
Laurent Destailleur
eb62c7e462 Merge pull request #1446 from GPCsolutions/removefiles
Made test pessimistic by default
2015-05-29 16:56:28 +02:00
Regis Houssin
53fbab52f3 Merge remote-tracking branch 'dolibarr/develop' into develop_origin 2015-05-29 16:32:53 +02:00
Laurent Destailleur
15405c9f7d Merge pull request #2917 from aspangaro/develop-patch24
Accountancy: Review presentation
2015-05-29 16:24:27 +02:00
Laurent Destailleur
ab29c594e8 Merge pull request #2920 from hregis/3.7
Fix: check the user status during authentication
2015-05-29 16:23:30 +02:00
Alexis Algoud
148c36c9d3 Merge branch 'fix_multientity_num_check' of github.com:atm-alexis/dolibarr into fix_multientity_num_check
Conflicts:
	htdocs/core/class/commonobject.class.php
2015-05-29 15:12:31 +02:00
Alexis Algoud
dd7febe2b9 replace test by getEntity() 2015-05-29 15:10:59 +02:00
Alexis Algoud
ab0f805044 Merge branch '3.6' of https://github.com/Dolibarr/dolibarr into fix_multientity_num_check 2015-05-29 15:09:04 +02:00
Gauthier
a707d40251 FIX : when we create an agenda event with "Not applicable" status, it is automatically saved with "To do" status 2015-05-29 14:32:50 +02:00
Regis Houssin
c8c0f0f038 Fix: possibility to shared facnumber between entities 2015-05-29 11:31:51 +02:00
Regis Houssin
49fc7f9ba7 Fix: check the user status during authentication 2015-05-29 10:09:18 +02:00
Regis Houssin
131c3fcef8 Fix: check the user status during authentication 2015-05-29 10:07:48 +02:00
aspangaro
27c0b84a13 Typo on search 2015-05-29 06:54:16 +02:00
aspangaro
fd988ab1f3 Review card of supplier/customer ventilation 2015-05-29 06:43:40 +02:00
aspangaro
47045e0746 Accountancy: Review presentation 2015-05-28 21:34:35 +02:00
Arnaud Aujon
c933d563f6 Merge branch '3.7-webservices-fix' of https://github.com/aaujon/dolibarr into 3.7-webservices-fix 2015-05-28 16:57:41 +02:00
Arnaud Aujon
3003b41a88 add test for invoices API 2015-05-28 16:57:28 +02:00
Arnaud Aujon
05a7ab158b add deleteThirdParty api call + add tests 2015-05-28 16:56:45 +02:00
Arnaud Aujon
33d5299a22 add deleteThirdParty api call + add tests 2015-05-28 15:40:38 +02:00
aspangaro
0bd07b795f NEW: Add tab document on salaries payment 2015-05-28 07:33:50 +02:00
aspangaro
d3513bf2a7 Fix: lot of typo to export salaries 2015-05-28 06:41:01 +02:00
aspangaro
58893a4576 Fix: problem of rights to export salaries 2015-05-28 06:26:28 +02:00
aspangaro
a8c49f11ca ER add key language 2015-05-28 06:16:58 +02:00
aspangaro
432cf998fa Fiche-rec: Forms are using the tab look, even in creation & add cancel button 2015-05-28 05:25:29 +02:00
aspangaro
33807c467d Fix: Wrong language key 2015-05-27 21:54:06 +02:00
Arnaud Aujon
336b8c49b3 update test 2015-05-27 15:42:46 +02:00
Arnaud Aujon
278d447e45 Use Constant for status 2015-05-27 15:42:34 +02:00
phf
a676d3a0d1 Merge branch '3.6' into 3.7 2015-05-27 10:56:16 +02:00
phf
5a006d824e FIX : top links menu have target attribute with wrong value 2015-05-27 10:52:23 +02:00
aspangaro
8eee0bdf73 NEW Forms are using the tab look, even in creation mode 2015-05-27 07:41:25 +02:00
aspangaro
5f5388a52a Fix: wrong link 2015-05-27 07:19:10 +02:00