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

55801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ce1f57786a Merge pull request #5794 from mrsof/develop 
NEW add confirm on reapeatable/template invoice deletion
 2016-09-28 20:01:39 +02:00
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
855ad3e166 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-28 18:19:26 +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
3f2ae3b881 Update changelog 2016-09-28 18:16:33 +02:00
Laurent Destailleur
c3f5962058 Normalize code 2016-09-28 18:14:44 +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
c110297032 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-28 17:54:10 +02:00
Laurent Destailleur
d953d3795f FIX #5803 2016-09-28 17:53:49 +02:00
arnaud
455bb7cdb4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_user_date_of_employment 2016-09-28 17:28:57 +02:00
Juanjo Menent
b1aa4d01d6 Merge pull request #5807 from atm-florian/develop 
FIX  : travis new ruselset.xml path
 2016-09-28 16:57:06 +02:00
florian HENRY
c5cf2be72e FIX : travis new ruselset.xml path 2016-09-28 14:52:15 +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
Laurent Destailleur
dcb18cd637 Clean and reorganize dev tools 2016-09-27 19:43:34 +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
arnaud
466576a05d Merge branch 'develop' of github.com:ATM-Consulting/dolibarr into HEAD 2016-09-27 15:14:08 +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
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
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