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

48309 Commits

Author SHA1 Message Date
Laurent Destailleur
05b1528029 Merge pull request #5800 from atm-gauthier/NEW_filters_on_ca_report 
NEW : add fields and filters on ca by third report
 2016-09-28 20:00:16 +02:00
Laurent Destailleur
e99f115a8f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/tables/llx_user.sql
 2016-09-28 19:49:36 +02:00
Laurent Destailleur
6653c03e07 Merge pull request #5799 from atm-arnaud/NEW_user_date_of_employment 
New user date of employment
 2016-09-28 19:35:20 +02:00
Laurent Destailleur
2d6877ac67 Add tables to store working employee contracts 2016-09-28 19:33:51 +02:00
Laurent Destailleur
5bf365e091 Merge pull request #5788 from atm-florian/dev_CommandeLine_Class_CleanDeclaration 
wotk on declaration method OrderLine
 2016-09-28 19:03:00 +02:00
Laurent Destailleur
86d86f8442 NEW #5801 More complete change to allow to disable supplier invoice 
document generation
 2016-09-28 18:59:44 +02:00
Laurent Destailleur
8fe02268ce Merge pull request #5806 from vinclar/patch-1 
FIX Correct filter refsupplier
 2016-09-28 18:17:47 +02:00
Laurent Destailleur
c3f5962058 Normalize code 2016-09-28 18:14:44 +02:00
Laurent Destailleur
bfd5bb37c5 Code comment 2016-09-28 18:07:31 +02:00
Laurent Destailleur
142a2e34db Merge pull request #5791 from atm-quentin/NEW_Trigger_Delete_Stock 
NEW Trigger on warehouse delete
 2016-09-28 18:00:28 +02:00
Laurent Destailleur
29634304fd Merge pull request #5795 from atm-ph/fix_4.0_value_too_long 
Fix fields too long for database
 2016-09-28 17:58:57 +02:00
Laurent Destailleur
e4f17c8763 FIX #5793 Normalise code. 2016-09-28 17:56:54 +02:00
Laurent Destailleur
d953d3795f FIX #5803 2016-09-28 17:53:49 +02:00
vinclar
00ebff816d Correct filter refsupplier 
Bad reference
 2016-09-28 14:20:54 +02:00
arnaud
f7bb7df6c7 FIX code 2016-09-28 11:23:00 +02:00
Juanjo Menent
b99b97573d New: Add thirdparty extrafields to export thirdparty categories 2016-09-28 10:53:22 +02:00
Juanjo Menent
30050b51f0 FIX: Failed to export contact categories with contact extra fields 2016-09-28 10:15:41 +02:00
fappels
3d58b0aef6 Fix livraison eatby and sellby parameters are dates 2016-09-28 00:22:29 +02:00
gauthier
e82f65cef2 NEW : add field and filters on ca by third report 2016-09-27 17:38:54 +02:00
arnaud
c904b8030c Merge branch 'NEW_user_date_employment' of github.com:atm-arnaud/dolibarr into HEAD 
Conflicts:
	htdocs/langs/en_US/users.lang
 2016-09-27 15:25:29 +02:00
arnaud
b717d530cd NEW User date of employment added 2016-09-27 15:16:16 +02:00
phf
058cf61ae0 Fix fields too long for database 2016-09-27 10:06:22 +02:00
Sof
23dffa33a6 Fix : email adress 2016-09-26 19:32:31 +02:00
Sof
86a06de015 New : add confirm on invoice deletion 
Alternatively reformated all code
 2016-09-26 19:29:54 +02:00
fappels
acbd00286c Fix stock decrement of lot qty on delivery 2016-09-26 17:31:55 +02:00
florian HENRY
4e5f646a0f fix travis test 2016-09-26 17:07:45 +02:00
Laurent Destailleur
586b223221 Work on remote integrity checker 2016-09-26 15:24:43 +02:00
Laurent Destailleur
e92184a738 Fix bad var $db 2016-09-26 14:55:36 +02:00
Laurent Destailleur
9b26db4151 Fix remove var_dump 2016-09-26 14:55:10 +02:00
atm-quentin
4d828499ac Update entrepot.class.php 2016-09-26 14:41:30 +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
b50d92e712 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/compta/localtax/index.php
 2016-09-26 14:16:53 +02:00
Laurent Destailleur
5d7f182f59 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-26 14:14:56 +02:00
Laurent Destailleur
8775a51cec Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-09-26 14:14:26 +02:00
Laurent Destailleur
67a1bf2b59 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-09-26 14:13:26 +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
fac946dbb8 FIX The email test sender in email setup was broken 2016-09-26 14:08:14 +02:00
Quentin Vial-Gouteyron
bf0556bdf1 NEW Trigger on delete stock 2016-09-26 10:47:54 +02:00
florian HENRY
5a8f0491b3 wotk on declaration method OrderLine 2016-09-26 09:34:51 +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
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
e531735444 Merge pull request #5777 from atm-florian/4.0_fixODTwithextrafieldsCheckbox 
FIX : #5776
 2016-09-26 00:49:02 +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
8829db7d65 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-25 16:45:16 +02:00
Laurent Destailleur
4cccaae831 Fix warning 2016-09-25 16:44:55 +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
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
florian HENRY
984a56adc5 FIX : #5776 2016-09-23 10:51:31 +02:00
Laurent Destailleur
dc45776d31 FIX Date visible on project overview 2016-09-23 10:32:19 +02:00
Laurent Destailleur
c6ef3778b7 FIX Creation of donation should go back on card after creation 2016-09-23 09:55:49 +02:00
Laurent Destailleur
039bf4aae9 Fix date 2016-09-22 19:16:29 +02:00
Laurent Destailleur
47b1f79030 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-22 18:48:34 +02:00
Laurent Destailleur
1642d7c23b Trans 2016-09-22 18:48:17 +02:00
Laurent Destailleur
8791a9f5f1 Fix date on Purchase Orders 2016-09-22 18:47:31 +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
448acbf7a1 Merge pull request #5766 from atm-florian/4.0 
fix customer accountancy lines ventilaled bad href link
 2016-09-22 09:15:52 +02:00
Laurent Destailleur
b2271bced1 Merge pull request #5768 from aspangaro/4.0-p49 
Fix: Accountancy - Problem on Cegid Export Format & presentation
 2016-09-22 09:15:19 +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
f9f95dec42 Merge pull request #5765 from hregis/3.9_bug 
Fix: Using $this when not in object context
 2016-09-22 09:10:56 +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
Laurent Destailleur
2c42697cae Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-21 01:26:22 +02:00
Laurent Destailleur
f1bb69eecf Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-21 01:26:03 +02:00