lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
55,740 Commits 43 Branches 150 Tags 886 MiB
bf0556bdf1
Commit Graph

55740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Quentin Vial-Gouteyron
bf0556bdf1 NEW Trigger on delete stock 2016-09-26 10:47:54 +02:00
Laurent Destailleur
108537746c git push origin developMerge branch 'EuskalMoneta-rest-api-add-accounts' into develop 2016-09-26 02:28:29 +02:00
Laurent Destailleur
3cb13e16d1 Merge branch 'rest-api-add-accounts' of 
https://github.com/EuskalMoneta/dolibarr into
EuskalMoneta-rest-api-add-accounts

Conflicts:
	htdocs/api/index.php
	htdocs/commande/class/api_orders.class.php
 2016-09-26 02:28:16 +02:00
Laurent Destailleur
d39d7d92c9 Uniformize code. 2016-09-26 02:13:58 +02:00
Laurent Destailleur
48b188d200 Merge pull request #5785 from EuskalMoneta/rest-api-add-countries-and-towns 
NEW Add Countries and Towns to the REST API.
 2016-09-26 01:33:56 +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
ac2c685e7d Fix bad commit 2016-09-26 01:13:55 +02:00
Laurent Destailleur
e9a073b223 git push origin developMerge branch 'EuskalMoneta-rest-api-add-members-and-subscriptions' into develop 2016-09-26 01:12:05 +02:00
Laurent Destailleur
0809be6680 Merge branch 'rest-api-add-members-and-subscriptions' of https://github.com/EuskalMoneta/dolibarr into EuskalMoneta-rest-api-add-members-and-subscriptions 2016-09-26 01:11:20 +02:00
Laurent Destailleur
0ab3728276 Merge pull request #5780 from aspangaro/5.0-p14 
Review of subscription
 2016-09-26 01:09:50 +02:00
Laurent Destailleur
17f3e09689 Fix link https 2016-09-26 01:04:48 +02:00
Laurent Destailleur
813f9120f6 Merge pull request #5781 from aspangaro/5.0-p15 
Typo "Execuete"
 2016-09-26 00:51:40 +02:00
Laurent Destailleur
4f2ce0ef30 Merge pull request #5782 from aspangaro/5.0-p16 
Correct presentation
 2016-09-26 00:51:15 +02:00
Laurent Destailleur
ea09eb13da Uniformize code 2016-09-26 00:10:29 +02:00
Xebax
fe2498ffc1 Fix coding style errors. 2016-09-25 19:11:16 +02:00
Xebax
0f3e308dd3 Fix coding style errors. 2016-09-25 19:05:49 +02:00
Xebax
58179f71fc Add Accounts to REST API. 2016-09-25 17:48:48 +02:00
Laurent Destailleur
34378d8bef Fix phpcs 2016-09-25 17:48:48 +02:00
Xebax
7e366c303e Add Towns to the REST API. 2016-09-25 17:43:15 +02:00
Xebax
d5ee73a1b7 Add Countries to the REST API. 2016-09-25 17:43:15 +02:00
Xebax
d05c8d32b1 Add Subscriptions to the REST API. 2016-09-25 17:40:45 +02:00
Xebax
cd11ccbedb Add Members to the REST API. 2016-09-25 17:40:29 +02:00
Laurent Destailleur
02a978bc4d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-25 15:45:19 +02:00
aspangaro
69452e91ca Merge remote-tracking branch 'Upstream/develop' into 5.0-p16 2016-09-25 05:49:33 +02:00
aspangaro
8f83b8cefd Merge remote-tracking branch 'Upstream/develop' into 5.0-p14 2016-09-25 05:48:36 +02:00
aspangaro
bac23ce422 Merge remote-tracking branch 'Upstream/develop' into 5.0-p15 
Conflicts:
	htdocs/commande/class/api_orders.class.php
 2016-09-25 05:45:58 +02:00
Laurent Destailleur
a7db09c020 Fix phpcs 2016-09-24 23:06:09 +02:00
aspangaro
8dc6a8fd1d Correct presentation 2016-09-24 14:47:51 +02:00
aspangaro
922495d72d Correct travis & typo "Execuete" 2016-09-24 07:18:38 +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
3eaec4d4b8 Uniformise fields in tables 2016-09-23 10:55:44 +02:00
Laurent Destailleur
f1166f1898 Fix warning 2016-09-22 13:00:02 +02:00
Laurent Destailleur
d598e206cd Fix warning 2016-09-22 12:56:48 +02:00
Laurent Destailleur
35dd492d19 NEW Add REST api for commercial proposals 2016-09-22 12:53:44 +02:00
Laurent Destailleur
8fa8bc7d34 Rename table for a better understanding 2016-09-22 11:39:43 +02:00
Laurent Destailleur
145f70a341 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-22 11:36:39 +02:00
Laurent Destailleur
4ec7bcd23e Rename api class to solve conflict 2016-09-22 11:36:16 +02:00
Laurent Destailleur
11533fc98d Removed a old hidden problematic feature never used in Dolibarr. If an 
external module need datatable, the module must provide all lib it needs
and manage version problems with other dolibarr components
 2016-09-22 11:31:15 +02:00
Laurent Destailleur
619b65e0b6 Fix warning 2016-09-22 11:06:39 +02:00
Laurent Destailleur
cef02a9766 Merge pull request #5764 from atm-gauthier/NEW_add_limit_stock_product_by_warehouse 
New add limit stock product by warehouse
 2016-09-22 09:15:05 +02:00
Laurent Destailleur
37a0df3277 Merge pull request #5761 from abilbaotm/patch-1 
Fix Syntax error, unrecognized expression: input.remain]
 2016-09-22 09:10:25 +02:00
Laurent Destailleur
d4e324d15a Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture.php
 2016-09-21 18:38:30 +02:00
Laurent Destailleur
9c12444a03 Fix size of warehouse and height of confirm box 2016-09-21 18:20:18 +02:00
Laurent Destailleur
494d4783a7 Fix tab works when editing prices 2016-09-21 18:13:27 +02:00
gauthier
2556e59ccf NEW : auto delete product_stock_entrepot elements when we drop a product or a warehouse 2016-09-21 16:21:23 +02:00
gauthier
6034b21746 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_add_limit_stock_product_by_warehouse 2016-09-21 12:17:38 +02:00
gauthier
576ef9e541 FIX : sql syntax for travis test 2016-09-21 09:31:40 +02:00
Laurent Destailleur
39c4feaef7 Enhancement for usage on smartphone 2016-09-21 03:54:54 +02:00
Laurent Destailleur
d759296c02 Fix color of amount 2016-09-21 01:39:05 +02:00
Laurent Destailleur
1c15539bb4 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-21 01:27:25 +02:00