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

62109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ef3d86333c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/activity/perday.php
 2017-10-06 12:38:50 +02:00
Laurent Destailleur
73f5d21ff8 Add button to make a leave request on the "leave" tab of user. 2017-10-06 12:36:11 +02:00
Laurent Destailleur
06b18a740e NEW Add date of birth on user card. 
NEW Show expected worked hours on the timesheet form.
 2017-10-06 12:08:01 +02:00
Laurent Destailleur
7871498724 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-06 11:03:03 +02:00
Laurent Destailleur
7b1fe6e5af Look and feel v6 2017-10-06 11:02:44 +02:00
Laurent Destailleur
edacf6789b Remove dead code 2017-10-06 10:47:58 +02:00
Laurent Destailleur
848aadb48a FIX Do not lose selected id after ENTER the TAB on autocomplete 2017-10-06 10:47:02 +02:00
Laurent Destailleur
67c571f952 Increase cyclomatic complexity threshold 2017-10-06 01:59:26 +02:00
Laurent Destailleur
337d6d9f08 Merge pull request #7565 from tarrsalah/fix_supplier_payment_builddoc 
Fix supplier payment builddoc
 2017-10-06 01:55:48 +02:00
Laurent Destailleur
e644d9d53f Fix syntax code 2017-10-06 01:49:07 +02:00
Laurent Destailleur
c06a78145c Rename function to avoid duplicate 2017-10-06 01:27:41 +02:00
Laurent Destailleur
801a5180d6 Fix scrutinizer bug reports 2017-10-06 01:16:19 +02:00
tarrsalah
7767f03e9c WIP: reuse actions_builddoc to build/remove supplier payment doc. 2017-10-05 10:44:08 +01:00
Laurent Destailleur
711bbe0afb FIX #7546 2017-10-05 11:09:09 +02:00
tarrsalah
76efc31b00 WIP fix supplier payement modelpath. 2017-10-05 09:51:17 +01:00
Laurent Destailleur
86e751bd45 Merge pull request #7563 from aspangaro/7.0-label_operation_on_general_ledger 
Fix : problems on accountancy & presentation
 2017-10-05 10:35:28 +02:00
Laurent Destailleur
ad63dc8b78 Merge pull request #7562 from hregis/develop_bug 
Fix: minimal num, maj and special character with value 0 not work
 2017-10-05 10:29:28 +02:00
Laurent Destailleur
f0b314dfd7 Change signature of file to match other urls to link/download files. 2017-10-05 10:25:06 +02:00
Laurent Destailleur
1cacfe4935 Merge pull request #7560 from Oeris/develop-api 
NEW Generates the document before downloading using REST API
 2017-10-05 10:04:08 +02:00
Laurent Destailleur
2a2cd30e19 Fix code 2017-10-05 10:00:43 +02:00
Laurent Destailleur
4730611333 Add language file button 2017-10-05 09:54:48 +02:00
Laurent Destailleur
04a56d4bd9 Fix phpunit 2017-10-05 09:34:09 +02:00
Alexandre SPANGARO
2f49b00f6c Fix : some small problems on accountancy 2017-10-05 06:56:13 +02:00
Alexandre SPANGARO
f1b7b36a11 Fix : problem on column in customer to bind index 2017-10-05 05:38:02 +02:00
Alexandre SPANGARO
9993e796ee Merge remote-tracking branch 'uptream/develop' into 7.0-label_operation_on_general_ledger 2017-10-05 05:12:56 +02:00
Laurent Destailleur
6540bc0061 Fix doxygen 2017-10-04 19:48:11 +02:00
Regis Houssin
1cee16a802 Fix: minimal num, maj and special character with value 0 not work 2017-10-04 18:32:52 +02:00
Laurent Destailleur
ded55f41fb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2017-10-04 16:08:22 +02:00
Neil Orley
a3096b4e9d NEW Generates the document before downloading using REST API 
Generates the document before downloading using REST API
 2017-10-04 15:59:54 +02:00
Laurent Destailleur
69c47aa7d9 Fix sql error 2017-10-04 15:22:55 +02:00
Laurent Destailleur
13cb806436 FIX #7531 #7537 2017-10-04 15:18:15 +02:00
Laurent Destailleur
d28188d19d FIX Generation of invoice from bulk action "Bill Orders" 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2017-10-04 14:31:52 +02:00
Laurent Destailleur
a74d6074a3 FIX Generation of invoice from bulk action "Bill Orders" 2017-10-04 14:27:10 +02:00
Laurent Destailleur
8e0da9bfeb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/document.php
 2017-10-04 13:32:53 +02:00
Laurent Destailleur
10142522e0 Fix typo 2017-10-04 13:30:43 +02:00
Laurent Destailleur
9b3826a54c Invert left and right (my own comment on left) 2017-10-04 13:17:16 +02:00
Laurent Destailleur
85606126a9 Standardize code for events 2017-10-04 12:58:13 +02:00
Laurent Destailleur
2dee81125a Hide comment feature for the moment 2017-10-04 11:18:31 +02:00
Laurent Destailleur
75a7e086b3 Merge pull request #7427 from atm-arnaud/NEW_comment_generic_element 
New comment generic element
 2017-10-04 11:13:39 +02:00
Laurent Destailleur
e7ac828cc7 Merge pull request #7551 from hregis/develop_bug_restapi 
Fix: refactorization of "getListForItem" function
 2017-10-04 10:59:55 +02:00
Laurent Destailleur
7f11138f19 Merge pull request #7555 from frederic34/patch-1 
can't clean search_type in holiday list
 2017-10-04 10:57:27 +02:00
Frédéric FRANCE
69314e08ac can't clean search_type in holiday list 2017-10-04 10:12:51 +02:00
Laurent Destailleur
436ec93084 FIX is_erasable report bad value when thirdparty was not loaded 2017-10-04 03:22:41 +02:00
Laurent Destailleur
7cf4ec772a Restore original travis setup 2017-10-04 02:56:45 +02:00
Laurent Destailleur
a6cf934973 Add log 2017-10-04 02:46:01 +02:00
Laurent Destailleur
bd3a76ee84 Debug travis 2017-10-04 02:00:38 +02:00
Laurent Destailleur
5b8e9f7269 Debug travis 2017-10-04 01:53:55 +02:00
Laurent Destailleur
3a41f2bddb Fix test when numbering ref is only numeric char. 2017-10-04 01:27:19 +02:00
Laurent Destailleur
f380747e20 More accurate error code 2017-10-04 01:11:19 +02:00
Laurent Destailleur
c08f33507f More accurate error code 2017-10-04 00:51:25 +02:00