Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
47,779 Commits 39 Branches 191 Tags
e9687cbc4f1c68e06da83170399c74c4eb810481
Commit Graph

47779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
e9687cbc4f Fix the amount for entry price must use the format dedicated to amount. 2015-05-31 18:23:11 +02:00
Laurent Destailleur
7d9856f3d8 Update doc 2015-05-31 17:52:32 +02:00
Laurent Destailleur
523b04a315 Work on finishing 2015-05-31 17:31:15 +02:00
Laurent Destailleur
3588d73c8e Fix css 2015-05-31 16:36:11 +02:00
Laurent Destailleur
1b681510a5 NEW Use new select2 component for juridical status, country and state 
selection.
 2015-05-31 12:25:33 +02:00
Laurent Destailleur
01aad8516d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/adherents/list.php
	htdocs/compta/dons/card.php
	htdocs/compta/dons/class/don.class.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/security.lib.php
	htdocs/main.inc.php
	htdocs/product/stock/massstockmove.php
	htdocs/public/test/test_arrays.php
	htdocs/public/test/test_forms.php
	htdocs/societe/societe.php
 2015-05-31 03:30:38 +02:00
Laurent Destailleur
36de50f60d Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-05-31 03:07:36 +02:00
Laurent Destailleur
3cfe4dc86e Sync language files 2015-05-31 03:07:17 +02:00
Laurent Destailleur
7c4c096310 Fix typo 2015-05-31 02:33:03 +02:00
Laurent Destailleur
86a5e88d7e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-31 02:21:42 +02:00
Laurent Destailleur
fd279ea1fa No more need to output log 2015-05-31 02:21:22 +02:00
Laurent Destailleur
ceb2622181 Merge pull request #2934 from aspangaro/develop-patch24 
NEW: Add a button to purge criteria in user list
 2015-05-31 02:18:43 +02:00
Laurent Destailleur
487879ffd7 Merge pull request #2933 from bafbes/develop 
fix 600 first lines of arabic language admin file
 2015-05-31 02:15:52 +02:00
Laurent Destailleur
3690274375 Merge pull request #2930 from atm-ph/fix_issue_2901 
Fix issue 2901
 2015-05-31 02:09:40 +02:00
Laurent Destailleur
49f2157f2d Little debug of module resource 2015-05-31 02:05:39 +02:00
Laurent Destailleur
5e773d4cb6 Work on finishing of style 2015-05-31 01:06:51 +02:00
Laurent Destailleur
7a0ec2d831 Prototype with datatables works now also ith jmobile. 
Add field fifo and lifo into product table.
 2015-05-30 23:56:42 +02:00
aspangaro
fa2413f45a NEW: Add a button to purge criteria in user list 2015-05-30 21:01:37 +02:00
Laurent Destailleur
9b4ab63c7d Fix style 2015-05-30 20:07:44 +02:00
Laurent Destailleur
36b7f1dcf3 NEW Show photo of logged user into login top right block. 
NEW If no photo is available for user, we show a generic photo depending
on gender
 2015-05-30 19:50:07 +02:00
Laurent Destailleur
0b372a4017 Use a dedicated icon instead of generic one 2015-05-30 17:32:50 +02:00
Laurent Destailleur
bfe85cbf37 Better error management 2015-05-30 16:14:54 +02:00
Laurent Destailleur
7f352e5b24 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-30 15:21:56 +02:00
Laurent Destailleur
b14b1c1b12 Use dedicated picto 2015-05-30 15:21:48 +02:00
Laurent Destailleur
d9e8b6d977 Merge pull request #2921 from atm-gauthier/3.7 
FIX : when we create an agenda event with "Not applicable" status, it…
 2015-05-30 15:10:53 +02:00
Laurent Destailleur
03c06b3cf8 Merge pull request #2916 from aspangaro/develop-patch23 
FIX: export salaries & NEW: Add tab document on salaries payment
 2015-05-30 15:09:23 +02:00
Laurent Destailleur
5e486d798e Merge pull request #2915 from aspangaro/develop-ER 
ER add key language
 2015-05-30 15:09:00 +02:00
Laurent Destailleur
133893336b Merge pull request #2914 from aspangaro/develop-patch22 
Fix: Wrong language key
 2015-05-30 15:07:17 +02:00
Laurent Destailleur
f5ec2c0605 Merge pull request #2911 from aspangaro/develop-md 
NEW Forms are using the tab look, even in creation mode
 2015-05-30 15:01:26 +02:00
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
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
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