Commit Graph

56014 Commits

Author SHA1 Message Date
florian HENRY
39aebb6944 NEW : add clone contract feature 2016-10-14 07:54:44 +02:00
florian HENRY
4e34b6e0c6 Merge remote-tracking branch 'origin/develop' into develop 2016-10-12 19:00:32 +02:00
florian HENRY
cc28391944 NEW : Export thirdparty with payement terms and mode 2016-10-12 18:59:34 +02:00
Laurent Destailleur
92dc385307 Merge pull request #5838 from atm-gauthier/develop_NEW_filter_by_supplier_on_replenishment_card
Develop new filter by supplier on replenishment card
2016-10-11 20:04:02 +02:00
Laurent Destailleur
9b1459e045 Merge pull request #5854 from defrance/patch-32
NEW Unactive user are at bottom of select list
2016-10-11 19:55:34 +02:00
Laurent Destailleur
fb2987ad56 Merge pull request #5862 from joseplluis/patch-4
Fix bug: replaced invoices in projects
2016-10-11 19:48:31 +02:00
Laurent Destailleur
5623bc60fc Merge pull request #5861 from bgenere/develop
Bug Fix : issue with commas in the SQL script.
2016-10-11 19:46:42 +02:00
Josep Lluís
89f4dbe64f Fix bug: replaced invoices in projects
In balance whole project, don't count the total amount in replaced invoices.
In invoice details the replaced invoices are OK.
2016-10-11 16:37:44 +02:00
Laurent Destailleur
fbd57eb248 Fix missing %s 2016-10-11 15:30:57 +02:00
Laurent Destailleur
6b198e06b5 Fix english 2016-10-11 15:24:10 +02:00
Laurent Destailleur
92423be43d Fix english 2016-10-11 15:03:56 +02:00
Laurent Destailleur
d0eb636051 Fix records is always singular 2016-10-11 14:50:32 +02:00
bgenere
7524b48ebc Merge remote-tracking branch 'upstream/develop' into develop 2016-10-11 14:00:45 +02:00
Laurent Destailleur
a5caced878 Fix translation 2016-10-11 13:48:27 +02:00
Laurent Destailleur
8755fa07af Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/tpl/admin_extrafields_add.tpl.php
	htdocs/main.inc.php
2016-10-11 12:35:14 +02:00
Laurent Destailleur
b91b8c64b5 Fix sql error if we use separator extra field 2016-10-11 12:27:20 +02:00
Laurent Destailleur
789eab6098 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-10-11 12:21:16 +02:00
Laurent Destailleur
b2afe98060 Fix option unique of extrafields not saved 2016-10-11 12:20:14 +02:00
Bruno Généré
966b31de0f Bug Fix : issue with commas in the SQL script. 2016-10-11 11:35:06 +02:00
Laurent Destailleur
e7a09c07f9 Sync and clean language files 2016-10-11 10:38:38 +02:00
Laurent Destailleur
94c5b40c51 Add warning 2016-10-10 21:22:28 +02:00
Laurent Destailleur
b903e1e5aa Update lang 2016-10-10 20:59:23 +02:00
Laurent Destailleur
b92fb9ebfd Fix orto 2016-10-10 20:12:28 +02:00
BENKE Charlie
9663883ae4 Unactive user place on bottom list
More usefull
2016-10-10 18:15:46 +02:00
Laurent Destailleur
44f9c65f6a Fix missing countries 2016-10-10 17:00:11 +02:00
Laurent Destailleur
269b9ea2ea Fix translation thirdparty -> third party 2016-10-10 15:15:54 +02:00
Laurent Destailleur
3329da1c8d Fix translation 2016-10-10 14:42:21 +02:00
Laurent Destailleur
710e12420f Use correct picto for lot 2016-10-10 02:01:30 +02:00
Laurent Destailleur
720bb76a8f Fix selection of model was not done on company bank accounts page 2016-10-10 01:18:08 +02:00
Laurent Destailleur
7504af42de Fix regression in GETPOST when value is an array 2016-10-10 00:56:35 +02:00
Laurent Destailleur
747123621c Fix better log 2016-10-10 00:53:54 +02:00
Laurent Destailleur
8cb38caca1 Fix regression in getUrl 2016-10-10 00:53:15 +02:00
Laurent Destailleur
e11d9d7e4c Reduce translation keys 2016-10-10 00:31:26 +02:00
Laurent Destailleur
bae1e69da3 NEW Can edit RUM number 2016-10-10 00:24:05 +02:00
Laurent Destailleur
27244c86ce Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-09 20:35:38 +02:00
Laurent Destailleur
89d08eadce Better explanation of option 2016-10-09 20:35:24 +02:00
Laurent Destailleur
e1c98bfcc8 Merge pull request #5852 from grandoc/develop
better help
2016-10-09 20:23:33 +02:00
Laurent Destailleur
74f2a4d597 Enable feature to check online signature 2016-10-09 20:20:24 +02:00
Laurent Destailleur
0803084cc4 NEW The getURLContent return more information on success and error 2016-10-09 20:13:27 +02:00
Laurent Destailleur
cd9654978b NEW Filters can accept generic search key like __DAY__, __MONTH__,
__YEAR__ replaced with current day, month year before making the search.
2016-10-09 19:49:09 +02:00
philippe grand
df825e2d49 better help 2016-10-09 11:45:39 +02:00
Laurent Destailleur
5b09737f13 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-07 19:09:56 +02:00
Laurent Destailleur
ba52eb870c Enhancement of Oauth module 2016-10-07 18:43:44 +02:00
Laurent Destailleur
4ae3d7e034 Merge pull request #5848 from atm-florian/develop
FIX delete line with no triggers
2016-10-07 17:18:07 +02:00
florian HENRY
38fa0bed4b FIX delete line with no triggers 2016-10-07 15:30:35 +02:00
Laurent Destailleur
44eb133a3f Work on PITCHME file 2016-10-07 14:26:00 +02:00
Laurent Destailleur
f4b4f2588f Test Pitchme 2016-10-07 14:19:08 +02:00
Laurent Destailleur
16296c7ccb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-07 14:18:31 +02:00
Laurent Destailleur
092e66d042 Test PICTHME 2016-10-07 14:17:39 +02:00
Laurent Destailleur
6eca563131 Merge pull request #5846 from hregis/4.0_bug
Fix: remove pdfmake for avoid errors
2016-10-07 13:44:37 +02:00