Commit Graph

48430 Commits

Author SHA1 Message Date
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
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
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
florian HENRY
38fa0bed4b FIX delete line with no triggers 2016-10-07 15:30:35 +02:00
Regis Houssin
bac21be15a Fix: remove for avoid errors 2016-10-07 13:32:34 +02:00
Laurent Destailleur
03876ba637 Merge pull request #5773 from atm-gauthier/NEW_reopen_bills_is_a_distinct_right
NEW : Reopen a paid bill is a user right
2016-10-07 13:31:10 +02:00
Laurent Destailleur
56f5db9523 Merge pull request #5844 from defrance/patch-31
Uniformise trigger name
2016-10-07 13:26:21 +02:00
Regis Houssin
9e8d8c5f5c Fix: pdfmake is not present 2016-10-07 13:16:33 +02:00
Laurent Destailleur
6489cd6164 Debug accounting module 2016-10-07 12:10:16 +02:00
BENKE Charlie
2a7ada6643 Uniformise trigger name 2016-10-07 12:07:17 +02:00
Laurent Destailleur
77e87b3c07 NEW Add tooltip in payment term edition in dictionnary 2016-10-07 00:37:06 +02:00
Laurent Destailleur
c908af6758 Merge pull request #5833 from atm-gauthier/develop_NEW_cdr_current_or_next_month
NEW Develop new cdr (current or next month) for payment terms.
2016-10-07 00:06:59 +02:00
Laurent Destailleur
b787b1a3d2 Merge pull request #5828 from olsesacl/contracdet_add_edit
FIX: Contract Error insert or edit empty value MYSQL 5.7
2016-10-07 00:02:45 +02:00
Laurent Destailleur
611f1bcf89 Merge pull request #5836 from yanntech/fix/postgresql
replace double quote per simple quote in update_frequency SQL
2016-10-07 00:01:31 +02:00
Laurent Destailleur
a91f93eeda Merge pull request #5831 from atm-florian/dev_fix5764_for_PgSQL
FIX : New add limit stock product by warehouse #5764 for PgSQL
2016-10-07 00:00:53 +02:00
Laurent Destailleur
a7fbb1e308 Merge pull request #5829 from olsesacl/#5779
FIX: #5779 Field 'File' is required
2016-10-06 23:59:02 +02:00
Laurent Destailleur
3c67d75348 Merge pull request #5842 from defrance/patch-30
Duplicate object Product declaration
2016-10-06 23:55:52 +02:00
Laurent Destailleur
f7f56132b2 Fix sql errors 2016-10-06 20:15:36 +02:00
Laurent Destailleur
28e4c17730 Debug module accountancy expert 2016-10-06 19:59:33 +02:00
Laurent Destailleur
0cfb0ff7b7 Complete help 2016-10-06 19:03:40 +02:00
Laurent Destailleur
539ee1ace2 Uniformize code 2016-10-06 18:06:40 +02:00
Laurent Destailleur
49e7e4901d Add page index for accountancy module 2016-10-06 17:43:31 +02:00
Laurent Destailleur
93c848fcc5 Add page index for accountancy module 2016-10-06 17:43:10 +02:00
Laurent Destailleur
c982409c72 Fix a deadlock feature 2016-10-06 15:29:10 +02:00
BENKE Charlie
272b16fe1a Duplicate product declation
Once is enough
2016-10-06 08:36:21 +02:00