Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

9416 Commits

Author SHA1 Message Date
altairis
699a3391c9 FCKeditor setup for tickets 2019-10-03 16:51:05 +02:00
Sebastien Baguet
d11bb9570c Add French and English translation 2019-10-03 13:44:40 +02:00
John Botella
135621c02b Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_dropdown_bookmark 2019-10-03 08:51:22 +02:00
Frédéric FRANCE
3afb4355a8 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-02 18:59:18 +02:00
Laurent Destailleur
d8a8c4fbe6 Look and feel v11. Picto are fontawesome. 2019-10-02 18:36:36 +02:00
Alexandre SPANGARO
a6e429ff32 Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal 2019-10-02 08:49:00 +02:00
Alexandre SPANGARO
4d5547636d Accountancy FAQ - Move to toggle() 2019-10-02 08:43:35 +02:00
Frédéric FRANCE
aca9d92db8 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 22:03:33 +02:00
florian HENRY
d48f0fa791 resolve conflixt 2019-10-01 18:07:59 +02:00
Frédéric FRANCE
5821caa7fc work on migration script 2019-10-01 18:02:39 +02:00
Laurent Destailleur
b79831ec39 Merge pull request #11952 from aspangaro/11.0_https 
Move Gnu.org to https
 2019-10-01 14:48:21 +02:00
Frédéric FRANCE
3b9bf2b06a Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 12:25:34 +02:00
John Botella
2edc3ffe4b Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_dropdown_bookmark 2019-10-01 08:50:34 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Alexandre SPANGARO
f91513937a Remove option to hide FAQ 2019-09-30 21:37:20 +02:00
Alexandre SPANGARO
8dea427f58 Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal 2019-09-30 21:23:27 +02:00
Frédéric FRANCE
31418c2e42 check php-calendar extension 2019-09-30 21:14:25 +02:00
Frédéric FRANCE
b87610adcc Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-30 19:34:35 +02:00
Frédéric FRANCE
fec67aade4 Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 18:44:34 +02:00
Laurent Destailleur
0e73beaccc Merge pull request #11987 from andreubisquerra/master 
Custome receipt tab in TakePOS
 2019-09-30 18:03:03 +02:00
Laurent Destailleur
48fc165026 Trans 2019-09-30 17:15:05 +02:00
John Botella
61c8e8ec0c Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_dropdown_bookmark 2019-09-30 17:13:54 +02:00
Laurent Destailleur
d65af06d20 Merge pull request #11869 from atm-john/new_ticket_messaging_page 
New ticket messaging page design
 2019-09-30 15:34:35 +02:00
Frédéric FRANCE
258424416e Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 07:49:52 +02:00
andreubisquerra
34be514326 Custom receipt tab in TakePOS 2019-09-29 20:56:24 +02:00
ATM john
cd821261e8 Add global search dropdown 2019-09-29 18:56:28 +02:00
Laurent Destailleur
266aace5d1 Trans 2019-09-29 18:55:48 +02:00
Laurent Destailleur
0f2b36bb82 Work on MRP module 2019-09-29 18:39:52 +02:00
Frédéric FRANCE
1b151da776 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-29 11:28:54 +02:00
Alexandre SPANGARO
8e42ac8cd0 Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal 2019-09-28 22:31:08 +02:00
Laurent Destailleur
a19fd8507e Trans 2019-09-28 13:47:51 +02:00
Laurent Destailleur
db32ca99c6 Fix translation and sql request 2019-09-28 12:36:09 +02:00
Frédéric FRANCE
cea3669ffa Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-28 00:35:14 +02:00
florian HENRY
885d958e63 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-27 20:12:09 +02:00
Laurent Destailleur
c0e7c558a1 Merge pull request #11860 from atm-john/new_box_supplier_orders_awaiting_reception 
NEW widget box for supplier orders awaiting reception
 2019-09-27 15:32:43 +02:00
Laurent Destailleur
a79c4608d6 Merge pull request #11934 from atm-quentin/NEW_stock_categories 
NEW Categories/Tags are also available on warehouses
 2019-09-27 12:41:28 +02:00
Laurent Destailleur
881c90ab74 Merge pull request #11953 from grandoc/new_branch_24_09_2019 
add missing translation
 2019-09-27 11:56:01 +02:00
Frédéric FRANCE
03086026b8 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-27 08:06:13 +02:00
Laurent Destailleur
ba1275332d Fix thousand separator for fr_NC 2019-09-25 13:03:43 +02:00
Frédéric FRANCE
41cb628d05 Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-25 08:06:44 +02:00
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
 2019-09-24 14:25:02 +02:00
Laurent Destailleur
7b3e64d67f NEW Support of Extrafields on Leave requests. 2019-09-24 12:01:18 +02:00
Philippe GRAND
7ec43e8b59 add missing translation 2019-09-24 09:54:57 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
a005408d83 NEW Accountancy - Add an option to hide FAQ on index and add widget in area 2019-09-23 20:42:50 +02:00
Laurent Destailleur
d22a1e2571 Use space 2019-09-23 19:44:05 +02:00
atm-quentin
80d5be56f6 Fix trans 2019-09-19 16:26:53 +02:00
atm-quentin
c09f2d8c4e NEW stock categories 2019-09-19 16:21:03 +02:00
Laurent Destailleur
ad3d21578c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-18 13:13:02 +02:00