Commit Graph

53599 Commits

Author SHA1 Message Date
Laurent Destailleur
b0b1056a44 Merge pull request #5121 from fmarcet/3.7
Fix: Not filtering correctly on supplier invoice's list
2016-04-29 17:19:15 +02:00
Laurent Destailleur
88842ccd8b Merge pull request #5111 from nka11/api_improvement
Api improvement
2016-04-29 17:13:02 +02:00
Laurent Destailleur
bec4c58732 Merge pull request #5133 from olsesacl/develop-bug-module-cronjob
FIX Bug insert cronjobs in modules, default values
2016-04-29 17:11:58 +02:00
Laurent Destailleur
3c2c9a25b8 Merge pull request #5130 from frederic34/patch-9
FIX if type fee not specified, line is invisible and can't edit it
2016-04-29 17:11:14 +02:00
Laurent Destailleur
84a39f41d6 Merge pull request #5125 from frederic34/patch-7
FIX Load user personal param at login. This cause boxes disordered at login time.
2016-04-29 17:10:41 +02:00
Laurent Destailleur
f4224881c3 Merge pull request #5132 from frederic34/patch-11
FIX keep files attached with PROV status
2016-04-29 17:08:22 +02:00
Laurent Destailleur
9a53e5edff Merge pull request #5131 from frederic34/patch-10
If no project, update line is impossible
2016-04-29 17:06:39 +02:00
Laurent Destailleur
8a4871323d Merge pull request #5022 from marcosgdf/bug-5008
FIX #5008 SQL error when editing the reference of a supplier invoice that already exists
2016-04-29 17:01:01 +02:00
Laurent Destailleur
174cead40d Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/commande/list.php
2016-04-29 15:33:57 +02:00
Laurent Destailleur
c539cc7151 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-04-29 15:30:04 +02:00
Laurent Destailleur
42f10234b1 Fix regression 2016-04-29 15:28:26 +02:00
Laurent Destailleur
f91a8934bd Merge remote-tracking branch 'origin/3.7' into 3.8 2016-04-29 15:17:11 +02:00
Laurent Destailleur
211d217f8c Merge remote-tracking branch 'origin/3.6' into 3.7 2016-04-29 15:13:27 +02:00
Laurent Destailleur
2a27fe02eb Fix detection if tag already exists 2016-04-29 15:12:58 +02:00
Juanjo Menent
926dd3d77f Merge pull request #5124 from olsesacl/develop-bug
FIX: Remove table tag
2016-04-29 13:55:54 +02:00
Frédéric FRANCE
7e8aef037a Update expensereport.class.php 2016-04-29 13:23:06 +02:00
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
Frédéric FRANCE
a982f764fe don't change ref if ref is not prov 2016-04-29 12:26:41 +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
Sergio Sanchis Climent
61fda99fc5 FIX Bug insert cronjobs in modules, default values 2016-04-29 01:13:10 +02:00
Frédéric FRANCE
ab63bdd235 keep files attached with PROV status 2016-04-28 22:30:22 +02:00
Frédéric FRANCE
c743f6cfe5 If no project, update line is impossible 2016-04-28 21:56:28 +02:00
Frédéric FRANCE
972e5e571d Update card.php 2016-04-28 21:52:23 +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
Frédéric FRANCE
4404197597 Load user personal param at login 2016-04-28 11:54:42 +02:00
fmarcet
33499ae652 FIX: Compatible with multicompany 2016-04-28 11:14:00 +02:00
Sergio Sanchis Climent
32d641b66b Bug show product if no accounting enabled 2016-04-28 11:12:04 +02:00
Laurent Destailleur
608c93702d FIX Can't create a stock transfer from product card 2016-04-28 11:05:34 +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
fmarcet
e96e0f637a FIX: Not filtering correctly when come from dashboard 2016-04-28 10:41:37 +02:00
fmarcet
d599261d20 FIX: Not filtering correctly when come from dashboard 2016-04-28 10:38:50 +02:00
Ferran Marcet
7380676717 Fix: Not filtering correctly on supplier invoice's list 2016-04-28 10:25:55 +02:00
Maxime Kohlhaas
0a67614e72 Fix wrong qty total in ca by prod/serv report 2016-04-28 09:10:22 +02:00
nka11
932b9837fe Merge branch 'fix_5053' into api_improvement 2016-04-28 08:31:10 +02:00
nka11
ce0436b809 Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into fix_5053 2016-04-28 08:30:33 +02:00
BENKE Charlie
8a63298102 Missing addMoreActionsButtons hook 2016-04-27 22:19:38 +02:00
BENKE Charlie
520facd55e Missing addMoreActionsButtons hook 2016-04-27 22:17:45 +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