Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 12:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
56,031 Commits 36 Branches 190 Tags
b51b6fa8c8870e0ec19997ba14db33c764f27293
Commit Graph

10237 Commits

Author SHA1 Message Date
Laurent Destailleur
03c312e35c Fix bad name for modules_action.php 2016-09-10 16:09:46 +02:00
Laurent Destailleur
f8dbc1aa9f Theme cleaner 2016-09-10 16:09:01 +02:00
Laurent Destailleur
858291c3a3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-09 09:32:51 +02:00
Laurent Destailleur
0debcf745a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/cron/card.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
 2016-09-09 09:32:14 +02:00
Juanjo Menent
aaa0431791 Merge pull request #5725 from GPCsolutions/develop-modules 
Enhanced modules base class
 2016-09-08 18:18:55 +02:00
Juanjo Menent
9e93cae097 Merge pull request #5717 from atm-ph/new_type_getpost 
New type for GETPOST
 2016-09-08 18:15:13 +02:00
Laurent Destailleur
417b2f566f FIX Translation of "Name" is not a good choice for floow-up. 2016-09-08 17:31:42 +02:00
Raphaël Doursenaud
d89a877a00 Added the new familyinfo property from 4.0.0 2016-09-08 16:58:01 +02:00
Raphaël Doursenaud
f97f011cd3 Added missing properties in modules class. 
Enhanced modules class documentation.
 2016-09-08 16:37:48 +02:00
Raphaël Doursenaud
4126928804 Fixed code discrepancy 
Most places and samples used editor_url so I opted for that.
 2016-09-08 16:37:45 +02:00
Laurent Destailleur
72e149e1a6 FIX SEC Improve CSRF protection. Reduce usage of NOCSRFCHECK. 2016-09-08 12:12:00 +02:00
Laurent Destailleur
99a3cc6efc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-08 11:39:47 +02:00
Laurent Destailleur
6d6eceb0ca Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-08 11:39:38 +02:00
Laurent Destailleur
2b7ef01e42 FIX SEC for HTB23302 2016-09-08 11:09:38 +02:00
Alexis Algoud
74d495c192 NEW filter actiontype on thirdparty tab 2016-09-08 10:26:38 +02:00
phf
d3a7b5453b New type for GETPOST 2016-09-08 10:25:48 +02:00
florian HENRY
baa7aa8cd4 New FEATURE 2016-09-07 14:08:41 +02:00
florian HENRY
d6be1cebcb work on going 2016-09-07 12:41:32 +02:00
Laurent Destailleur
5fdca121aa NEW Can renamed attached files on products and expense reports 2016-09-07 01:54:16 +02:00
Laurent Destailleur
5aaa3028a2 FIX Better position of fields in expense report PDF. 2016-09-07 01:47:09 +02:00
Laurent Destailleur
cc9230c07f FIX Columns truncated and translation missing 2016-09-06 13:08:49 +02:00
Laurent Destailleur
898bbd6031 NEW Support extrafields for expense reports 2016-09-06 13:00:32 +02:00
Laurent Destailleur
8419202588 NEW Support free bottom text and watermark on expense report template 2016-09-06 12:47:18 +02:00
Laurent Destailleur
666c62af04 Fix http into https 2016-09-06 00:59:31 +02:00
Laurent Destailleur
d24045d831 NEW Editing translation GUI become easier with search translation tool. 2016-09-04 14:45:43 +02:00
Laurent Destailleur
e4539be127 FIX sortfield and sortorder parameters output twice in navigation url. 2016-09-04 13:28:37 +02:00
Laurent Destailleur
cb27b01812 Work on feature to find a translation key 2016-09-03 18:47:04 +02:00
Laurent Destailleur
f440e78fa6 FIX quick search boxes when nojs or when using smartphone 2016-09-03 12:56:49 +02:00
Laurent Destailleur
13746a3c03 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-02 22:37:59 +02:00
Laurent Destailleur
aab3b2837a FIX #5589 2016-09-02 22:34:37 +02:00
Laurent Destailleur
eee53998ad Mark function as deprecated #5577 2016-09-02 22:14:15 +02:00
Laurent Destailleur
571aae7026 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-02 21:52:20 +02:00
Laurent Destailleur
0e4b4ee321 Merge branch 'develop-external-logging' of 
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-develop-external-logging

Conflicts:
	composer.json
 2016-09-02 21:51:25 +02:00
Laurent Destailleur
b01d1979f8 Merge pull request #5680 from aspangaro/5.0-p7 
NEW: Move Expense report menu from module to menu files (Again)
 2016-09-02 18:39:49 +02:00
Laurent Destailleur
91ede48390 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-01 11:37:40 +02:00
Laurent Destailleur
0961ce2a2c FIX Missing filter on environment 2016-09-01 01:08:01 +02:00
Laurent Destailleur
bf7a6380c9 Fix sort on wrong field 2016-09-01 01:00:28 +02:00
Laurent Destailleur
3e84d227b3 Remove not used function calculate_byte. Use dol_print_size instead. 2016-08-31 19:57:17 +02:00
Laurent Destailleur
07e6c156a3 Fix free to reachable 2016-08-31 19:48:15 +02:00
Laurent Destailleur
8fd082cf16 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/hrm/hrm.php
 2016-08-31 16:16:19 +02:00
Laurent Destailleur
e62299d67e NEW Add date into list of print jobs for Google Print. 2016-08-31 14:36:08 +02:00
Laurent Destailleur
8cfac3b5c3 FIX Several problems when using smartphone 2016-08-31 12:38:54 +02:00
Juanjo Menent
90c670a89e Merge pull request #5684 from aspangaro/5.0-p9 
Uniformize presentation on suppliers invoices
 2016-08-31 10:08:57 +02:00
aspangaro
688ac691a9 Uniformize presentation on suppliers invoices 2016-08-31 07:05:23 +02:00
aspangaro
3892f295c7 Uniformize presentation of customer's invoice 2016-08-31 06:27:35 +02:00
Juanjo Menent
612db4f66d Merge pull request #5673 from aspangaro/5.0-p5 
Fix: Presentation on member card
 2016-08-31 02:09:28 +02:00
Juanjo Menent
8155c09d49 Merge pull request #5671 from aspangaro/5.0-p3 
Fix: Presentation on financial account
 2016-08-31 02:08:33 +02:00
Laurent Destailleur
524dd79198 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/bank/search.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/tasks/time.php
 2016-08-31 00:16:07 +02:00
aspangaro
b5f093436e NEW: Move Expense report menu from module to menu files (Again) 2016-08-30 21:43:17 +02:00
aspangaro
e2a92f304d Presentation on member card 2016-08-29 22:07:21 +02:00