lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
59,494 Commits 43 Branches 150 Tags 886 MiB
478349174c
Commit Graph

59494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
478349174c Merge pull request #6902 from aspangaro/6.0-salary 
NEW : Move employee in dol_banner in salaries
 2017-05-29 11:47:10 +02:00
Laurent Destailleur
d7cecef0f2 Merge pull request #6901 from aspangaro/6.0-d2 
Fix : Correct bank transfert when we write operation on general ledger
 2017-05-29 11:45:18 +02:00
Laurent Destailleur
cce05a4070 Merge branch 'develop' into 6.0-d2 2017-05-29 11:45:13 +02:00
Laurent Destailleur
395d361d66 Look and feel v6 2017-05-29 11:38:23 +02:00
Laurent Destailleur
30bc8b9a32 Fix typo 2017-05-29 11:00:36 +02:00
Laurent Destailleur
85c3880479 Look and feel v6 2017-05-29 10:58:41 +02:00
Laurent Destailleur
0c5bf21f3a Merge pull request #6900 from aspangaro/6.0-d1 
Review expense report - Look and feel v6
 2017-05-29 10:56:57 +02:00
Laurent Destailleur
f363845cbe Merge pull request #6899 from hregis/develop_bug_restapi 
Fix: [Restler] Delete the cache file otherwise it does not update
 2017-05-29 10:50:43 +02:00
Laurent Destailleur
3f5cf0ee18 Merge pull request #6897 from hregis/develop_bug4 
Fix: for view special values
 2017-05-29 10:46:03 +02:00
Laurent Destailleur
452579150d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/class/html.form.class.php
 2017-05-29 10:43:26 +02:00
Laurent Destailleur
e667d72547 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/skeletons/build_class_from_table.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
 2017-05-29 10:41:51 +02:00
Laurent Destailleur
05a537dfb6 Merge pull request #6895 from grandoc/new_branch_25_05 
New branch 25 05
 2017-05-29 10:33:28 +02:00
Laurent Destailleur
38b97c5a3c Merge pull request #6894 from grandoc/develop 
fix : bad link
 2017-05-29 10:33:05 +02:00
Laurent Destailleur
e4a2e42caf Merge branch 'develop' into develop 2017-05-29 10:33:00 +02:00
Laurent Destailleur
ea13e18f9e Merge pull request #6892 from hregis/develop_bug3 
Fix: Wrong path for external module API REST
 2017-05-29 10:30:09 +02:00
Laurent Destailleur
16456cf19f Merge pull request #6891 from hregis/develop_api 
NEW add REST api "memberstypes"
 2017-05-29 10:29:04 +02:00
Laurent Destailleur
d0e1b30670 Merge pull request #6889 from aspangaro/6.0-multijournal 
Accountancy Clean code
 2017-05-29 10:25:10 +02:00
Laurent Destailleur
b22817c237 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture/fiche-rec.php
 2017-05-29 10:25:07 +02:00
Laurent Destailleur
425192ef84 Merge branch 'develop' into 6.0-multijournal 2017-05-29 10:23:46 +02:00
Laurent Destailleur
f265e7d86a Merge pull request #6888 from hregis/develop_bug2 
Fix: wrong min value
 2017-05-29 10:18:59 +02:00
Laurent Destailleur
dc246fa44c Merge pull request #6887 from hregis/develop_new 
New: add REST api "dictionaryevents" for use with "agendaevents"
 2017-05-29 10:16:35 +02:00
Laurent Destailleur
1da648402d Merge pull request #6886 from hregis/develop_bug 
Fix: use encrypt for llx_const data
 2017-05-29 10:16:07 +02:00
Laurent Destailleur
4a330af4bf Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-05-29 10:15:30 +02:00
Laurent Destailleur
aa0a369f06 Fix typo 2017-05-29 10:15:10 +02:00
Laurent Destailleur
d526fcc091 Merge pull request #6884 from hregis/5.0_bug 
Fix: wrong SPECIMEN value
 2017-05-29 10:14:52 +02:00
Laurent Destailleur
5ff85a6586 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-05-29 10:13:55 +02:00
Laurent Destailleur
de1db57a9d Merge pull request #6883 from dvasseur/develop 
FIX: REST API not possible to add agendaevents
 2017-05-29 10:12:33 +02:00
Laurent Destailleur
b7b2184fb6 Merge pull request #6879 from atm-arnaud/FIX_pagination_resources 
FIX pagination on resources
 2017-05-29 10:12:11 +02:00
Laurent Destailleur
d19a8929df Merge pull request #6875 from atm-ph/fix_develop_ref_column_inventory 
Fix missing column ref on migration for inventory
 2017-05-29 10:11:26 +02:00
Laurent Destailleur
4474fc8014 Merge pull request #6872 from aspangaro/6.0-pcard 
Use getNomUrl for accounting account in product card
 2017-05-29 10:05:06 +02:00
Laurent Destailleur
70636cc59f FIX SQL injection on user/index.php parameter search_statut. 2017-05-29 09:59:21 +02:00
Alexandre SPANGARO
0d3c5bcfa8 Update documents & info page - better look & feel v6 2017-05-29 06:35:53 +02:00
Alexandre SPANGARO
dad1abd55b NEW : Move employee in dol_banner in salaries 2017-05-29 06:22:21 +02:00
Laurent Destailleur
84a3cbb97a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-29 02:48:17 +02:00
Laurent Destailleur
d0f01085d8 Add more information on stripe payment 2017-05-29 02:44:14 +02:00
Laurent Destailleur
d03d179fa3 FIX Fullname when member is a moral entity with no name. 2017-05-28 23:43:24 +02:00
Alexandre SPANGARO
b0f2e95c7b Debug 2017-05-28 22:11:57 +02:00
Alexandre SPANGARO
095545e8d9 Fix : Correct bank transfert when we write operation on general ledger 2017-05-28 21:56:18 +02:00
Alexandre SPANGARO
48477e00fd Review payment part on expense report card 2017-05-28 06:49:17 +02:00
Laurent Destailleur
c651f1da45 Work on modulebuilder tool 2017-05-27 19:05:36 +02:00
Alexandre SPANGARO
570f9aaa9e Review old payment page for expense report 2017-05-27 08:18:53 +02:00
Alexandre SPANGARO
783cec0d6d Move to getNomUrl for expense report in bank entries 2017-05-27 07:21:59 +02:00
Alexandre SPANGARO
1711107420 FIX : colspan in bank entries 2017-05-27 07:11:17 +02:00
Regis Houssin
db9e068500 Fix: [Restler] Delete the cache file otherwise it does not update 2017-05-26 17:38:57 +02:00
Regis Houssin
ee2019ae37 Fix: limit to 100 by default to avoid freeze 2017-05-26 16:52:27 +02:00
Regis Houssin
f8fead4b90 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_new 2017-05-26 16:51:45 +02:00
Regis Houssin
95b2b1bd17 Fix: for view special values 2017-05-26 10:28:10 +02:00
Laurent Destailleur
7a1480d362 Look and feel v6 2017-05-26 00:02:41 +02:00
philippe grand
1f3a8b507e missing translation 2017-05-25 22:02:57 +02:00
Laurent Destailleur
ca08f814c1 Remove deprecated files 2017-05-25 19:38:42 +02:00