lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
63,037 Commits 43 Branches 150 Tags 886 MiB
debc0480dd
Commit Graph

7386 Commits

Author SHA1 Message Date
Laurent Destailleur
11cc82e6d2 Update doc 2017-11-10 10:15:50 +01:00
Laurent Destailleur
e7abc92f97 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/transfer.php
	htdocs/core/lib/functions.lib.php
 2017-11-06 21:37:19 +01:00
Laurent Destailleur
1d9873e1a9 FIX #7756 Add better error message 2017-11-06 21:17:30 +01:00
Laurent Destailleur
9cc923f317 Fix for ch accounting account. 2017-11-06 21:12:29 +01:00
Laurent Destailleur
ea5dd3eb3d NEW Add REST API for supplier proposals 2017-11-06 11:06:31 +01:00
Laurent Destailleur
a329f7dc75 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/list.php
 2017-11-05 18:50:14 +01:00
Laurent Destailleur
21a0f11395
Merge pull request #7760 from Oeris/develop-api 
NEW Adds the payment reference to the return of the function getListOfPayements
 2017-11-05 18:29:59 +01:00
Laurent Destailleur
d3a0cff30a
Merge pull request #7755 from frederic34/currency 
default currency on propal create
 2017-11-05 18:28:40 +01:00
Laurent Destailleur
bac6a434f4 Add link to make a direct download on card 2017-11-04 17:11:58 +01:00
Neil Orley
3ecccadb8b NEW Adds the payment reference to the return of the function getListOfPayements 
Adds the payment reference to the return of the function getListOfPayements
 2017-11-03 13:04:23 +01:00
Frédéric FRANCE
b58df17545
default currency on propal create 2017-11-02 18:14:55 +01:00
Laurent Destailleur
309e83a946 Remove the "add" in addpayment. Action in API is hosted by the method 2017-11-02 16:06:44 +01:00
Laurent Destailleur
36f7f32205 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-02 16:02:24 +01:00
Laurent Destailleur
d70f9e053e Remove the get in url. The GET is already in the method. 2017-11-02 16:01:13 +01:00
Laurent Destailleur
93ab4cadff
Merge pull request #7753 from Oeris/develop-api 
NEW Add REST API to add payment line to a specific invoice
 2017-11-02 15:54:22 +01:00
Laurent Destailleur
1b28c45e2c PERF Links in getNomUrl use only one tag a instead of 2. 2017-11-02 15:19:14 +01:00
Neil Orley
5febdf7bae NEW Add payment line to a specific invoice using the REST API 
Add payment line to a specific invoice using the REST API
 2017-11-02 15:01:38 +01:00
Laurent Destailleur
068f5e32cb NEW Tooltip for substitutions variables on tooltips on admin pages 2017-10-31 11:17:44 +01:00
Laurent Destailleur
75bbcdf575 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-29 11:29:01 +01:00
Laurent Destailleur
d569218162 Fix 'separate' extrafields must be visible by default. 
Sandardize name of list pages (must end with _list.php)
 2017-10-29 11:23:20 +01:00
Neil Orley
9a1c684870 FIX wrong paramters name in the usecreditnote method 
Rename 'creditnoteid' with 'discountid' in the URI
Rename 'creditId' with 'discountid' in the method
 2017-10-27 10:02:17 +02:00
Laurent Destailleur
ee1996ad37 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2017-10-27 01:16:51 +02:00
Laurent Destailleur
740c89365d Code comment 2017-10-27 00:42:44 +02:00
Laurent Destailleur
6a9837528e Merge pull request #7703 from Oeris/develop-api 
FIX Data related to customer moved to thirparties api
 2017-10-27 00:42:10 +02:00
Laurent Destailleur
f4a06aef3f Update api_invoices.class.php 2017-10-27 00:36:06 +02:00
Laurent Destailleur
8058712d47 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/contrat/class/contrat.class.php
	htdocs/product/list.php
 2017-10-26 17:06:11 +02:00
Laurent Destailleur
67208b111d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/facture.php
	htdocs/expedition/card.php
	htdocs/product/list.php
 2017-10-26 17:02:40 +02:00
Laurent Destailleur
202712be94 Work on module builder 2017-10-25 22:02:07 +02:00
Neil Orley
da0a205a10 NEW Deduct an available credit to an existing invoice 
Deduct an available credit to an existing invoice using the REST API
 2017-10-25 17:09:37 +02:00
Neil Orley
3e53a2ecff FIX merging conflict 2017-10-25 14:52:33 +02:00
Neil Orley
ff760eb8d5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-10-25 14:46:44 +02:00
Neil Orley
257acb6679 NEW Insert a discount in a specific invoice using the REST API 
Add ability to insert a discount in a specific invoice.
 2017-10-25 14:41:12 +02:00
Neil Orley
ec6a19a123 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api-down-payments 2017-10-25 09:57:53 +02:00
Laurent Destailleur
f24204c79a Error management after extrafield update 2017-10-24 19:04:40 +02:00
Laurent Destailleur
9f0f5eb5e8 Fix translation of extrafields type 2017-10-24 18:05:43 +02:00
Laurent Destailleur
3f4c2b54d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-24 15:22:59 +02:00
Laurent Destailleur
7b661685cc Debug modBlockedLog module 2017-10-24 15:22:46 +02:00
Neil Orley
b4c484cf0b NEW Get available assets of an invoice using the REST API 
Returns a list of paid down-payments, available avoirs, etc. with the payments detail
 2017-10-24 14:29:28 +02:00
Laurent Destailleur
576db84445 Merge pull request #7701 from mistraloz/patch-2 
Feature Request : Name of invoice when they are Draft (instead of "Pr…
 2017-10-24 13:06:33 +02:00
Laurent Destailleur
e9d851ef34 Merge pull request #7691 from Oeris/develop-api 
NEW Retrieves available discounts and payments details from a specific invoice
 2017-10-24 12:49:55 +02:00
Laurent Destailleur
8592e1b1e8 Update api_invoices.class.php 2017-10-24 12:49:37 +02:00
Laurent Destailleur
b6825703b4 Update api_invoices.class.php 2017-10-24 12:47:15 +02:00
Laurent Destailleur
2a1280c715 Merge pull request #7661 from atm-ph/fix_6_0_no_hook_recap_compta 
NEW External module can interact with the customer summary page
 2017-10-24 12:39:31 +02:00
Neil Orley
c34a6db13a Rename assets with avoirs 2017-10-24 11:53:39 +02:00
Neil Orley
41104de7ce NEW Get available assets of an invoice using the REST API 
Returns a list of paid down-payments, available avoirs, etc. with the payments detail
 2017-10-24 11:47:25 +02:00
Neil Orley
02c8f7f905 Modify rights check in the getPayments method 2017-10-24 11:25:31 +02:00
mistraloz
36adda92c2 Feature Request : Name of invoice when they are Draft (instead of "Prov....") #7669 
Feature Request : Name of invoice when they are Draft (instead of "Prov....") #7669
-> Change only the tooltip with ref_supplier or ref_client
 2017-10-24 11:17:02 +02:00
Neil Orley
0a43a12420 NEW Get a payment list of a given invoice using the REST API 
Add the getpayments method to retrieve a list of payments of a given invoice
 2017-10-24 10:50:38 +02:00
Neil Orley
2a9ddf7437 Remove whitespace 2017-10-23 16:49:00 +02:00
Neil Orley
bd0079b3f1 NEW Retrieve available discounts and payments details from an invoice 
Adds the ability to get availbales discounts and payments details of a specific invoice unsing the REST API.
 2017-10-23 16:45:49 +02:00