Commit Graph

56023 Commits

Author SHA1 Message Date
florian HENRY
a0470e987c Merge branch 'develop' into dev_clonecontract 2016-10-14 10:05:43 +02:00
florian HENRY
0b78f7f101 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2016-10-14 10:05:28 +02:00
florian HENRY
c53b33c1f0 add old copy to manage value into triggers clone 2016-10-14 08:39:29 +02:00
florian HENRY
39aebb6944 NEW : add clone contract feature 2016-10-14 07:54:44 +02:00
Laurent Destailleur
d78f204fb6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-13 22:30:01 +02:00
Laurent Destailleur
7c1b74133a Debug accountancy module 2016-10-13 22:29:49 +02:00
Laurent Destailleur
37a9d84425 Debug accountancy module 2016-10-13 21:48:07 +02:00
Laurent Destailleur
b134f853e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-13 21:25:48 +02:00
Laurent Destailleur
28f64e78eb Debug multicurrency 2016-10-13 21:25:13 +02:00
Laurent Destailleur
78e8ab64aa Debug multicurrency 2016-10-13 21:17:46 +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