Commit Graph

61931 Commits

Author SHA1 Message Date
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
Laurent Destailleur
c4f09b8894 Work on modulebuilder 2017-05-28 14:43:17 +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
BENKE Charlie
e4f7f2a0b2 $resaction need in 5.0.x too 2017-05-26 12:39:49 +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
philippe grand
9dfc8a9dc8 fix : bad link 2017-05-25 19:13:13 +02:00
Regis Houssin
74e9b9bf0a Fix: Wrong path for external module API REST 2017-05-25 13:50:41 +02:00
Regis Houssin
954670731d Fix: changelog 2017-05-25 09:05:19 +02:00
Regis Houssin
18886849eb New: add REST api "memberstypes" 2017-05-25 08:54:30 +02:00
BENKE Charlie
b0bac770e5 menu descriptor must be only present in main
If we add the same menu descriptor 
the additionnal menu are added on the second, not the main
I propose to suppress it OR change "customers_bills" as "customers_bills_list" who allow to add some menu as sub-menu
2017-05-25 08:07:11 +02:00
Alexandre SPANGARO
db6d7d9e21 Spaces 2017-05-25 07:15:36 +02:00
Alexandre SPANGARO
e89c4e9f41 Merge remote-tracking branch 'uptream/develop' into 6.0-pcard 2017-05-25 07:15:03 +02:00
Alexandre SPANGARO
e4f5d45c45 Remove old code (selectjournal_accountancy_bookkepping) 2017-05-25 07:10:09 +02:00
Alexandre SPANGARO
1f079fac9d Move html.formventilation.class.php to html.formaccounting.class.php 2017-05-25 06:57:28 +02:00
Regis Houssin
fea60e2675 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug2 2017-05-25 06:34:31 +02:00
Alexandre SPANGARO
a086b82f84 Removed old code (Function select_pcgtype/subtype) 2017-05-25 05:40:41 +02:00
Alexandre SPANGARO
ba7e754174 Remove old code (journal) 2017-05-25 05:32:13 +02:00
Laurent Destailleur
e5fe629a0e NEW Extrafields support formulas to be computed using PHP expressions 2017-05-24 22:48:44 +02:00
Laurent Destailleur
3782bc4458 Look and feel v6 2017-05-24 19:47:02 +02:00
Regis Houssin
659436f1ed Fix: wrong min value 2017-05-24 19:33:44 +02:00
Regis Houssin
339d9dbfdf New: add REST api "dictionaryevents" for to use with "agendaevents" 2017-05-24 18:44:03 +02:00
Regis Houssin
55121c5e05 Fix: use encrypt for llx_const data 2017-05-24 16:35:02 +02:00
Laurent Destailleur
160eb194ea Clean REST response for user and third parties 2017-05-24 15:24:35 +02:00
Laurent Destailleur
f011197e00 Update swagger to 2.0.24 2017-05-24 15:12:45 +02:00