Commit Graph

56883 Commits

Author SHA1 Message Date
Laurent Destailleur
b51b6fa8c8 Merge pull request #5865 from atm-florian/develop
NEW : Export thirdparty with payement terms and mode
2016-10-15 02:18:07 +02:00
Laurent Destailleur
cec792f142 Merge pull request #5867 from aspangaro/4.0-p2
Fix: Missing language key
2016-10-15 02:16:14 +02:00
Laurent Destailleur
dda248cb57 Merge pull request #5870 from olsesacl/#5340
FIX: #5340 Importing Tiers problem with capital field
2016-10-15 02:16:00 +02:00
Laurent Destailleur
4fb66cf7a4 Better explanation for ftp module setup to avoid error with FTPS/SFTP. 2016-10-15 02:11:49 +02:00
Laurent Destailleur
850a275b47 Fix duplicate accounting account with same number. Add unique key. 2016-10-14 18:46:30 +02:00
Laurent Destailleur
1f6ddb485f Fix missing module supplier proposal for external users 2016-10-14 18:22:07 +02:00
Laurent Destailleur
d27dea8320 NEW Can rename uploaded or generated files on all "documents" tabs. 2016-10-14 18:09:24 +02:00
Laurent Destailleur
5e00fb8fc7 Fix sepa mandate translation 2016-10-14 17:56:22 +02:00
Laurent Destailleur
78182ab504 Fix sepa mandate translation 2016-10-14 17:47:05 +02:00
Laurent Destailleur
a54a610a05 Uniformize code 2016-10-14 17:44:41 +02:00
Laurent Destailleur
a7c6ecc177 Fix better compatibility with multicompany 2016-10-14 16:05:25 +02:00
Laurent Destailleur
e74718827f Debug accountancy module 2016-10-14 15:44:33 +02:00
Laurent Destailleur
ca46ff8eb5 Fix pagination/navigation on general ledger page 2016-10-14 13:46:04 +02:00
Laurent Destailleur
79d376ee12 Debug accountancy module 2016-10-14 13:05:01 +02:00
gauthier
012be8e400 NEW : security check to avoid adding a parent warehouse chich is already a child of current one 2016-10-14 12:42:42 +02:00
gauthier
805b65addd FIX : semicolon 2016-10-14 12:02:24 +02:00
gauthier
61a3188353 FIX : new parameter documentation 2016-10-14 11:59:07 +02:00
gauthier
1a648cfc89 NEW : getNomUrl displays full path to warehouse
# Conflicts:
#	htdocs/product/stock/class/entrepot.class.php
2016-10-14 11:53:04 +02:00
gauthier
fe1bcb7e0a NEW : function to display full path to current warehouse 2016-10-14 11:39:46 +02:00
gauthier
416311a7b9 NEW : allow to save a parent warehouse
# Conflicts:
#	htdocs/product/stock/card.php
2016-10-14 11:29:14 +02:00
Sergio Sanchis
63a7b506b1 Fix: Error if exist extrafield 2016-10-14 10:55:54 +02:00
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
Sergio Sanchis Climent
567f7e5365 FIX: #5340 2016-10-14 00:43:10 +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
Sergio Sanchis Climent
8556dab68e NEW: #5830 2016-10-13 16:44:17 +02:00
aspangaro
0b08db16a1 Fix: Missing language key 2016-10-13 06:31:09 +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
Regis Houssin
6423b23fb3 Fix: use parameter instead constant 2016-10-12 15:36:51 +02:00
Regis Houssin
d848e98759 Fix: add possibility to change width type to prevent some display issues 2016-10-12 15:33:33 +02:00
Benlo
4ebd1ff8a2 Permit to print Total TTC price in objectline 2016-10-12 12:30:22 +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
Laurent Destailleur
24420edd46 Prepare 4.0.2 2016-10-11 14:36:13 +02:00
bgenere
7524b48ebc Merge remote-tracking branch 'upstream/develop' into develop 2016-10-11 14:00:45 +02:00