Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
53,429 Commits 36 Branches 189 Tags
14838d222ba27eda2eb113266fc03c9115b9b51a
Commit Graph

46148 Commits

Author SHA1 Message Date
Laurent Destailleur
14838d222b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-29 17:53:29 +02:00
Laurent Destailleur
8fe799f424 Merge branch 'dol_resource' of https://github.com/aternatik/dolibarr 
into aternatik-dol_resource

Conflicts:
	dev/initdata/img/printcompany.png
	htdocs/compta/bank/card.php
 2016-04-29 17:51:11 +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
174cead40d Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/commande/list.php
 2016-04-29 15:33:57 +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
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
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
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
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
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
77fcbd3884 FIX: init var at wrong place report incorrect "shippable" flag on draft 
order.
 2016-04-27 12:34:52 +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
nka11
19e223e84b Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into api_improvement 2016-04-27 09:43:00 +02:00
nka11
98f757a87a New API methods 
add user to group
get product list by category id
 2016-04-27 08:59:12 +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
nka11
56d25a7c2b Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into fix_5053 2016-04-26 07:31:00 +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
nka11
8b92e552a3 fix #5053 and bogus 051c5f4 2016-04-24 09:55: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