Commit Graph

53393 Commits

Author SHA1 Message Date
Sergio Sanchis Climent
cd4e104b76 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Conflicts:
	htdocs/product/card.php
2016-04-29 12:39:00 +02:00
Juanjo Menent
5ca989c836 Merge pull request #5126 from FHenry/dev_fixpgsql
FIX Postgres migration from 3.9 to 4.0
2016-04-29 12:18:49 +02:00
Juanjo Menent
6d58103d11 Merge pull request #5091 from marcosgdf/fr-4972
NEW #4972 Translated Charges sociales (type 0) and Charges sociales (type 1) in reports page
2016-04-29 12:03:04 +02:00
Juanjo Menent
206dee7106 Merge pull request #5086 from aspangaro/4.0-p23
NEW: Loan - Add list to select accounting account in admin
2016-04-29 12:01:44 +02:00
Juanjo Menent
08a875b813 Merge pull request #5084 from atm-maxime/new_remaintopay_invoice_list
New add remain to pay column in invoice list
2016-04-29 12:00:53 +02:00
Juanjo Menent
d6b1cd8a1c Merge pull request #5083 from aspangaro/4.0-p22
FIX: Accountancy - Work on categories for report - Add french example & other
2016-04-29 11:59:41 +02:00
Juanjo Menent
a33df1401b Merge pull request #5079 from marcosgdf/fix-undefined-variable
Fixed undefined $user variable in Account::countAccountToReconcile
2016-04-29 11:58:48 +02:00
Juanjo Menent
143a70c893 Merge pull request #5078 from atm-maxime/new_stats_on_home
New stats on home (contacts and interventions)
2016-04-29 11:57:44 +02:00
Juanjo Menent
9909143c42 Merge pull request #5076 from aspangaro/4.0-p21
FIX: For external api, don't use lengt_accountg without module accountancy activated
2016-04-29 11:55:55 +02:00
Laurent Destailleur
2ea5bf3d5e FIX: Pre selected value was not used on supplier list ouput 2016-04-28 20:04:48 +02:00
Laurent Destailleur
0419987b6f NEW Add view of virtual stock into product list (when appropriate) 2016-04-28 15:22:38 +02:00
Florian HENRY
e698c410f5 FIX Postgres migration from 3.9 to 4.0 2016-04-28 13:56:17 +02:00
Sergio Sanchis Climent
32d641b66b Bug show product if no accounting enabled 2016-04-28 11:12:04 +02:00
Laurent Destailleur
e723966583 FIX: Qty in stock must be float like it is in stock movement.
FIX: Can't create a stock transfer from product card
Performance enhancement of stock information loading.
2016-04-28 11:01:56 +02:00
Laurent Destailleur
aa31a7e9c5 Finished list of template invoices 2016-04-27 20:09:55 +02:00
Laurent Destailleur
7608366e70 Fix pagination 2016-04-27 19:34:38 +02:00
Laurent Destailleur
9987c9b77a Can sort on field of recurring invoices 2016-04-27 17:36:05 +02:00
Laurent Destailleur
7770d95b18 FIX PHPCS 2016-04-27 16:56:09 +02:00
Laurent Destailleur
39bc4d5f02 Optimize load_stock and load_stock_virtual 2016-04-27 14:19:06 +02:00
Laurent Destailleur
c6371060d0 FIX Stock limit for alert added into list of available fields for stock 2016-04-27 14:05:35 +02:00
Laurent Destailleur
810a6c2cb4 Better explanation 2016-04-27 13:39:54 +02:00
Laurent Destailleur
2beb16ef32 Remove limit on product ref on replenishment 2016-04-27 12:30:36 +02:00
Laurent Destailleur
bb91fb174b FIX: init var at wrong place report incorrect "shippable" flag on draft
order.
2016-04-27 12:30:00 +02:00
Laurent Destailleur
60e693e9a4 Minor fixes on recurring invoices 2016-04-27 11:35:11 +02:00
Laurent Destailleur
bdb7fe8d29 Missing public note on recurring invoices
Can change position of lines in recurring invoices
2016-04-27 11:07:20 +02:00
Laurent Destailleur
11217db8c4 FIX: when creating project from template/recurring invoice creation, we
lost information we were working in template/recurring invoice.
2016-04-27 10:56:40 +02:00
Laurent Destailleur
78cda5dc07 Fix problem with code of reccuring invoices 2016-04-26 22:00:41 +02:00
Laurent Destailleur
56b57b0bc9 Code comment 2016-04-26 13:37:09 +02:00
Laurent Destailleur
66ea799eb7 Uniformize code and add more comment to understand workflow 2016-04-26 13:27:32 +02:00
Laurent Destailleur
714b5556f3 FIX if qty to ship is < 0, we sugest 0 2016-04-26 13:13:18 +02:00
Laurent Destailleur
4758c82d41 Solve minor translation 2016-04-26 09:45:19 +02:00
Laurent Destailleur
a2a5fa6f4f Update screenshots 2016-04-26 01:13:55 +02:00
Laurent Destailleur
c73f4e5d7b FIX Project was lost when creating invoice from a template
Can set project on invoice during creation of invoice from a template
Replace duplicated code to show lines with mutualized code
2016-04-24 20:00:00 +02:00
Laurent Destailleur
ccdbf69cd5 Bette explanation on how to create an repeatable invoice 2016-04-24 18:11:19 +02:00
Laurent Destailleur
bcb4b2b607 Work on website module 2016-04-23 21:34:10 +02:00
Marcos García de La Fuente
82ee964c27 NEW #4972 Translated Charges sociales (type 0) and Charges sociales (type 1) in reports page
Close #4972
2016-04-23 18:22:11 +02:00
Laurent Destailleur
1a883d870b Uniformize style 2016-04-23 17:35:33 +02:00
Laurent Destailleur
9d21b63562 Beautify a page 2016-04-23 16:55:08 +02:00
Laurent Destailleur
00a658143d NEW List of user in agenda view per user show photo thumb 2016-04-23 16:51:22 +02:00
aspangaro
c652d5b02d NEW: Loan - Add list to select accounting account in admin 2016-04-23 16:06:33 +02:00
Maxime Kohlhaas
c5787a4bba New add remain to pay column in invoice list (was present in previous versions) 2016-04-23 16:02:18 +02:00
aspangaro
1454f5cafa FIX: Accountancy - Table account integer 0 by default 2016-04-23 15:44:31 +02:00
aspangaro
04fd5a20ef FIX: Accountancy Work on categories for Report - Add french example 2016-04-23 15:43:28 +02:00
Laurent Destailleur
b639849a47 Page for proposals must be called card.php (one of last architecture
change before the freeze)
2016-04-23 15:37:22 +02:00
Marcos García de La Fuente
f195107bd1 Fixed undefined $user variable in Account::countAccountToReconcile 2016-04-23 13:25:23 +02:00
Maxime Kohlhaas
4e42e73f60 New add stats on interventions 2016-04-23 13:16:19 +02:00
Maxime Kohlhaas
df4d016684 New add stats on contacts 2016-04-23 13:06:46 +02:00
aspangaro
2a7c7a0748 Same problem on bank 2016-04-23 08:09:38 +02:00
aspangaro
8f9c3f96cf Merge remote-tracking branch 'Upstream/develop' into 4.0-p21 2016-04-23 07:07:15 +02:00
aspangaro
a8aeba3ade FIX: For external api, don't use lengt_accountg without module accountancy activated 2016-04-23 07:05:16 +02:00