Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
56,821 Commits 36 Branches 189 Tags
e83bb0f50c1b0b51a587a423183563f07f46a982
Commit Graph

2968 Commits

Author SHA1 Message Date
Laurent Destailleur
3599f2c840 Uniformize code for recurring invoices 2016-10-04 12:31:45 +02:00
Laurent Destailleur
45a808e034 NEW Generation of document is available on member card 2016-10-03 00:08:47 +02:00
Laurent Destailleur
9fbe96dd38 Fix name of agenda tab 2016-10-02 21:31:32 +02:00
Laurent Destailleur
f92ca518f7 Uniformize look and feel 2016-10-02 16:38:58 +02:00
Laurent Destailleur
ee252f549a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	dev/skeletons/skeleton_list.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/lib/cron.lib.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
 2016-10-01 18:42:50 +02:00
Laurent Destailleur
521008a698 FIX #5746 chrome php 
Try a fix. Not sure it solved all problems reported
 2016-10-01 17:27:52 +02:00
Laurent Destailleur
91a9cb4178 Fix solution to avoid the .noexe 2016-10-01 14:02:24 +02:00
Laurent Destailleur
20ad359c9b FIX Warning to grant permission must be visible only if one module add 
some permissions
 2016-09-30 18:26:32 +02:00
Laurent Destailleur
287f9972a8 Merge branch 'new_no_default_rights' of 
https://github.com/atm-maxime/dolibarr into
atm-maxime-new_no_default_rights

Conflicts:
	htdocs/langs/en_US/admin.lang
 2016-09-30 13:04:14 +02:00
Laurent Destailleur
2b8255590a Better error message 2016-09-29 13:55:46 +02:00
Laurent Destailleur
6232e59fd2 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-26 14:17:36 +02:00
Laurent Destailleur
e60d2b0ae5 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2016-09-26 14:10:39 +02:00
Laurent Destailleur
100312aac2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/adherents/class/cotisation.class.php
 2016-09-26 01:32:50 +02:00
Laurent Destailleur
ea09eb13da Uniformize code 2016-09-26 00:10:29 +02:00
Laurent Destailleur
4cccaae831 Fix warning 2016-09-25 16:44:55 +02:00
aspangaro
2dbeeedd14 Move tab menu for subscription in member.lib 
Move all pages for subscription member in adherent/subscription (Card / Info / List)
Rename llx_cotisation in llx_subscription
Rename all db field cotisation in subscription
Rename class Cotisation in class Subscription
 2016-09-24 06:48:40 +02:00
Laurent Destailleur
dc45776d31 FIX Date visible on project overview 2016-09-23 10:32:19 +02:00
Laurent Destailleur
133657a8c7 Uniformize code 2016-09-21 01:25:34 +02:00
Laurent Destailleur
79ddc2458d Better center of left, center and right part of titles. 2016-09-20 12:51:09 +02:00
Laurent Destailleur
af28a67803 Uniformize look using dol_banner 2016-09-19 10:43:30 +02:00
Laurent Destailleur
77e2037195 NEW Add REST API to read, create and delete agenda events 2016-09-19 02:02:45 +02:00
Laurent Destailleur
c8b8e13014 Work on dol_banner for proposals. 2016-09-18 21:38:20 +02:00
Laurent Destailleur
5ea9fc7467 NEW Support extrafields on product lot. 2016-09-12 17:27:44 +02:00
Laurent Destailleur
cad69c9e90 Fix phpcs 2016-09-11 13:38:15 +02:00
Laurent Destailleur
e90909051e Merge pull request #5718 from atm-alexis/NEW_filter_type_action_thirdparty_event_tab 
NEW filter on action type on thirdparty event tab
 2016-09-11 13:34:08 +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
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
Laurent Destailleur
898bbd6031 NEW Support extrafields for expense reports 2016-09-06 13:00:32 +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
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
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
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
aspangaro
e2a92f304d Presentation on member card 2016-08-29 22:07:21 +02:00
aspangaro
358bcee3a5 Presentation on financiel account 2016-08-29 21:49:34 +02:00
Laurent Destailleur
d6d474f10d Clean code for category management. 2016-08-29 21:31:27 +02:00
Laurent Destailleur
fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/sociales/charges.php
	htdocs/core/boxes/modules_boxes.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
 2016-08-28 02:40:20 +02:00
Laurent Destailleur
0d992b2b99 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/cron/class/cronjob.class.php
	htdocs/install/pgsql/functions/functions.sql
 2016-08-28 02:17:04 +02:00