Laurent Destailleur
|
1351a43a30
|
FIX Maxi debug of permission for users external or restricted to sales
representatives
|
2017-12-18 16:13:05 +01:00 |
|
Neil Orley
|
ee6b0d7237
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api
|
2017-12-18 14:36:29 +01:00 |
|
Laurent Destailleur
|
98b82d712a
|
NEW Revenue stamp can be a percent
FIX Revenue stamp not visible on the transfer payment page
|
2017-12-18 12:43:03 +01:00 |
|
Laurent Destailleur
|
8e12551f17
|
Fix not employee must not appear on page to create salaries
|
2017-12-18 11:55:34 +01:00 |
|
Laurent Destailleur
|
a020dbf3d7
|
Merge pull request #7953 from atm-ph/fix_6.0_checkbox_credit_note
Fix since jquery 3 we can check all checkbox of credit note options
|
2017-12-16 01:13:55 +01:00 |
|
Laurent Destailleur
|
9cdf322bfb
|
Fix scrutinizer bugs
|
2017-12-15 22:14:28 +01:00 |
|
Laurent Destailleur
|
8bb89f6bf4
|
Fix look and feel v6
|
2017-12-15 17:24:36 +01:00 |
|
Laurent Destailleur
|
5ae13ea9d6
|
Fix navigation in bank direct debit orders
|
2017-12-15 17:05:01 +01:00 |
|
Neil Orley
|
e61d625577
|
FIX error message
|
2017-12-15 10:02:23 +01:00 |
|
Neil Orley
|
5ae74f8ae1
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api
|
2017-12-15 09:56:02 +01:00 |
|
Alexandre SPANGARO
|
24ae3d5879
|
NEW : Add search on date and accounting account in various payment list
|
2017-12-15 07:04:05 +01:00 |
|
atm-ph
|
a2f4afbf88
|
Fix wrong or missing char for url
|
2017-12-13 16:17:22 +01:00 |
|
atm-ph
|
46770178d2
|
Fix since jquery 3 we can check all checkbox of credit note options
|
2017-12-13 15:24:09 +01:00 |
|
Laurent Destailleur
|
676e5a1bca
|
Merge pull request #7943 from aspangaro/7.0-b4
FIX : Various payment
|
2017-12-12 14:54:44 +01:00 |
|
Laurent Destailleur
|
af1028576d
|
Fix on search all (trim search + search from smartphone).
|
2017-12-12 11:31:30 +01:00 |
|
Laurent Destailleur
|
9314dcb046
|
Fix regression
|
2017-12-12 10:13:48 +01:00 |
|
Laurent Destailleur
|
bb7c03906e
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/societe/list.php
|
2017-12-11 15:25:09 +01:00 |
|
Laurent Destailleur
|
48499fb506
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-12-11 15:21:22 +01:00 |
|
Alexandre SPANGARO
|
7b935a96bf
|
FIX : Various payment
|
2017-12-11 07:03:37 +01:00 |
|
Laurent Destailleur
|
dbd96d1ac7
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/actions_sendmails.inc.php
htdocs/loan/card.php
htdocs/loan/class/loan.class.php
|
2017-12-10 21:46:23 +01:00 |
|
Laurent Destailleur
|
d836d68801
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-12-10 21:29:35 +01:00 |
|
Laurent Destailleur
|
f7b663379a
|
Fix PHP 7.2
|
2017-12-10 21:04:59 +01:00 |
|
Laurent Destailleur
|
3415ce4664
|
Merge pull request #7938 from aspangaro/7.0-b3
FIX : Debug various_payment
|
2017-12-10 20:59:45 +01:00 |
|
Maxime Kohlhaas
|
12d0928244
|
Fix display error message when stock not enough on invoice validation
|
2017-12-10 19:59:56 +01:00 |
|
Laurent Destailleur
|
02d9e93ed4
|
Fix badge and use of data-html instead of html tag
|
2017-12-10 15:46:35 +01:00 |
|
Laurent Destailleur
|
4443c0f0a0
|
Fix style
|
2017-12-10 15:24:47 +01:00 |
|
Alexandre SPANGARO
|
ac95ccd872
|
FIX : Debug various_payment
|
2017-12-10 14:05:36 +01:00 |
|
Laurent Destailleur
|
701ae7d21b
|
Fix responsive
|
2017-12-08 20:15:28 +01:00 |
|
Laurent Destailleur
|
95cb5025a2
|
Fix length of month too large
More complete template
|
2017-12-08 16:15:41 +01:00 |
|
Laurent Destailleur
|
f85e79e250
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/filefunc.inc.php
htdocs/holiday/class/holiday.class.php
|
2017-12-08 13:13:53 +01:00 |
|
Laurent Destailleur
|
b671edb116
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-12-08 13:10:30 +01:00 |
|
Laurent Destailleur
|
09d3db145b
|
Merge
|
2017-12-08 13:10:13 +01:00 |
|
Regis Houssin
|
1b16eb731d
|
Fix: missing load product translation file
|
2017-12-08 11:00:23 +01:00 |
|
Regis Houssin
|
1bdffa961f
|
Fix: wrong translation if multilang activated
|
2017-12-08 10:41:14 +01:00 |
|
Regis Houssin
|
04327189f7
|
Fix: access error when user not right to view all customers
|
2017-12-08 09:41:33 +01:00 |
|
Regis Houssin
|
c4b2c3e697
|
FIXME $accounts[$bid] is a label !
|
2017-12-08 09:17:12 +01:00 |
|
Regis Houssin
|
8e1a9064cb
|
Fix: avoid warning again
|
2017-12-08 09:00:05 +01:00 |
|
Regis Houssin
|
95fa183fac
|
Fix: Avoid warning "A non-numeric value encountered"
|
2017-12-08 08:49:03 +01:00 |
|
Laurent Destailleur
|
98149ae316
|
Fix regression
|
2017-12-06 23:31:42 +01:00 |
|
Laurent Destailleur
|
56b0279ed7
|
Fix translation
|
2017-12-05 20:46:36 +01:00 |
|
Laurent Destailleur
|
2c19c0a10e
|
Fix test
|
2017-12-05 20:16:28 +01:00 |
|
Laurent Destailleur
|
21ba8509c9
|
Merge pull request #7910 from ATM-Nicolas/6.0_fix_project_conf
NEW link project from other company conf
|
2017-12-05 19:18:07 +01:00 |
|
Laurent Destailleur
|
5ab7fa7422
|
Fix location on good page
|
2017-12-05 15:48:24 +01:00 |
|
Laurent Destailleur
|
3a9bf455e2
|
FIX #7870
|
2017-12-05 13:38:24 +01:00 |
|
Laurent Destailleur
|
93311e3817
|
FIX #7885
|
2017-12-05 12:31:57 +01:00 |
|
ATM-Nicolas
|
bdf1e30ef3
|
Merge branch 'develop' into 6.0_fix_project_conf
|
2017-12-05 12:20:48 +01:00 |
|
Laurent Destailleur
|
8019f73f99
|
Fix: protection to not delete invoice if invoice is in bookkeeping
|
2017-12-05 10:01:30 +01:00 |
|
Laurent Destailleur
|
9b5f7099f7
|
Code comment
|
2017-12-03 19:50:15 +01:00 |
|
Laurent Destailleur
|
1b3680c200
|
Fix missing css
|
2017-12-03 12:21:38 +01:00 |
|
Laurent Destailleur
|
11286dee4a
|
Delete of payment
|
2017-12-03 11:59:16 +01:00 |
|
Laurent Destailleur
|
1f4a079f01
|
Fix bug reported by scrutinizers
|
2017-12-02 15:03:14 +01:00 |
|
Laurent Destailleur
|
38be224665
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-12-02 14:14:26 +01:00 |
|
Laurent Destailleur
|
29568287ef
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-12-02 14:13:44 +01:00 |
|
Laurent Destailleur
|
5fae19b4d6
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-12-02 14:13:29 +01:00 |
|
Laurent Destailleur
|
c7d0e917fb
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
|
2017-12-02 14:12:43 +01:00 |
|
Laurent Destailleur
|
9cafb08759
|
Merge pull request #7853 from atm-ph/fix_5.0_invoice_updateline_calcul_price_total
Fix product type is ignored and can generate a diffrent result with s…
|
2017-12-02 14:06:25 +01:00 |
|
Laurent Destailleur
|
ce32da6217
|
Fix debugs APIs
|
2017-12-01 15:39:18 +01:00 |
|
gauthier
|
f04af6c1b3
|
FIX : test for filter fk_status
|
2017-11-29 11:06:33 +01:00 |
|
Laurent Destailleur
|
c1e6d35ca5
|
Merge pull request #7878 from atm-florian/dev_informize_extrafield_list_search
factorization of extrafields into list
|
2017-11-28 12:14:47 +01:00 |
|
Laurent Destailleur
|
ef786f2271
|
Debug accountancy module
|
2017-11-28 11:31:55 +01:00 |
|
Laurent Destailleur
|
a9d3e90b70
|
Big debug of accountancy module
|
2017-11-27 21:53:22 +01:00 |
|
florian HENRY
|
94285ae494
|
factorization of extrafeild into list
|
2017-11-27 15:24:29 +01:00 |
|
Laurent Destailleur
|
807bfbb696
|
Merge pull request #7867 from frederic34/bank
info bank
|
2017-11-27 14:50:00 +01:00 |
|
atm-ph
|
5fef6478a5
|
Fix wrong calcul_price_total() update
|
2017-11-27 11:26:41 +01:00 |
|
Laurent Destailleur
|
5bdb7d1b98
|
Fix line "none" must not be visible if there is lines
|
2017-11-25 23:28:00 +01:00 |
|
Laurent Destailleur
|
6a9056a924
|
Fix line "none" must not be visible if there is lines
|
2017-11-25 23:26:14 +01:00 |
|
Laurent Destailleur
|
e99f190ff1
|
Save search context on list of template invoices
|
2017-11-25 15:56:36 +01:00 |
|
Laurent Destailleur
|
dbcb38dd3b
|
Use short label on table
|
2017-11-25 15:13:39 +01:00 |
|
Laurent Destailleur
|
1d97dd2bd8
|
NEW can filter on status of template invoices
|
2017-11-25 15:08:19 +01:00 |
|
Laurent Destailleur
|
77509ee37a
|
Removed deprecated apis
|
2017-11-25 13:14:28 +01:00 |
|
Frédéric FRANCE
|
6a91b16995
|
info bank
|
2017-11-25 12:13:03 +01:00 |
|
Laurent Destailleur
|
aaf08ade2f
|
Fix bug reported by scrutinizer
|
2017-11-25 11:21:31 +01:00 |
|
Laurent Destailleur
|
412c4e335d
|
Fix method of herited object has same signature than parent
|
2017-11-25 11:10:52 +01:00 |
|
Laurent Destailleur
|
4f4f929efb
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/holiday/class/holiday.class.php
|
2017-11-24 17:02:14 +01:00 |
|
Laurent Destailleur
|
3db52b5f9e
|
Debug responsive of v7
|
2017-11-24 14:23:25 +01:00 |
|
Laurent Destailleur
|
9c22b5f335
|
Replace deprecated dol_print_graph with DolGraph
|
2017-11-23 20:24:05 +01:00 |
|
Laurent Destailleur
|
5cf21fef05
|
Use autocompletion on list of taxes
|
2017-11-23 15:46:52 +01:00 |
|
Laurent Destailleur
|
6a3dc91414
|
Standardize code
|
2017-11-23 15:22:32 +01:00 |
|
Laurent Destailleur
|
b93e35cdd2
|
Fix a lot of request to use the IN getentity instead of =
Fix a lot of request to use left join on type of payment table
|
2017-11-23 15:06:16 +01:00 |
|
Laurent Destailleur
|
5a2fe13958
|
Fix travis
|
2017-11-22 21:36:01 +01:00 |
|
atm-ph
|
219e58d0e4
|
Fix product type is ignored and can generate a diffrent result with situation invoice
|
2017-11-22 12:15:02 +01:00 |
|
ptibogxiv
|
16e791913f
|
Fix import date
fix import date when creation
|
2017-11-19 21:56:50 +01:00 |
|
ptibogxiv
|
35182066a8
|
update createfromorder
lack of 2 fields date_start and date_end not imported from order
|
2017-11-19 16:25:35 +01:00 |
|
Laurent Destailleur
|
f284cd6c0f
|
Fix phpcs
|
2017-11-18 02:15:56 +01:00 |
|
Laurent Destailleur
|
14946a0dfa
|
Fix sort on status
|
2017-11-18 02:14:04 +01:00 |
|
Laurent Destailleur
|
a00353f332
|
Fix link to create invoice from template on list
|
2017-11-18 02:07:52 +01:00 |
|
Laurent Destailleur
|
fc1441086c
|
Fix status in template invoice
|
2017-11-18 02:01:04 +01:00 |
|
Laurent Destailleur
|
03cc685037
|
NEW Add a status enabled/disabled on recurring invoices
|
2017-11-18 00:54:23 +01:00 |
|
Laurent Destailleur
|
cf0d67d71c
|
Generation of pdf become default value
|
2017-11-17 23:57:32 +01:00 |
|
Laurent Destailleur
|
77a0762fc1
|
Fix comment
|
2017-11-17 15:07:32 +01:00 |
|
Laurent Destailleur
|
2f6dfc2387
|
Merge pull request #7800 from atm-maxime/new_deposit_convert_unpaid
NEW deposits can be converted even if unpaid
|
2017-11-17 15:05:33 +01:00 |
|
Laurent Destailleur
|
ead629708c
|
Look and feel v6
|
2017-11-17 14:57:14 +01:00 |
|
Laurent Destailleur
|
92753273b9
|
Fix upload api for invoices and bad id for bank account
|
2017-11-17 11:44:52 +01:00 |
|
Laurent Destailleur
|
f68b2bdeca
|
Use the confirmation when deleting from mass action everywhere.
|
2017-11-15 11:39:11 +01:00 |
|
Neil Orley
|
8e869688f5
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api
|
2017-11-15 10:42:00 +01:00 |
|
Laurent Destailleur
|
c85acbfc11
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/install/repair.php
|
2017-11-14 19:47:33 +01:00 |
|
Neil Orley
|
9b2611933d
|
NEW Create an invoice using an existing order
Create an invoice using an existing order using the REST API
|
2017-11-14 15:49:09 +01:00 |
|
Neil Orley
|
e513ed09f6
|
Change the way pa_ht is calculated
|
2017-11-14 14:43:50 +01:00 |
|
Laurent Destailleur
|
b5196b7164
|
FIX A lot of several fix on local taxes and NPR tax
|
2017-11-13 14:24:40 +01:00 |
|
Laurent Destailleur
|
1a5bbef266
|
FIX Locatax were not propagated when cloning order or proposal
|
2017-11-13 13:07:31 +01:00 |
|
Laurent Destailleur
|
f33182acc5
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-11-12 20:49:53 +01:00 |
|
Laurent Destailleur
|
836f6bf3c9
|
Fix search filter when using extrafields 'links'
|
2017-11-12 12:39:23 +01:00 |
|
Laurent Destailleur
|
d29233f553
|
Merge pull request #7801 from atm-maxime/fix_multi_vat_deposit
Fix multi VAT deposit when special lines are in origin document
|
2017-11-11 18:03:31 +01:00 |
|
Laurent Destailleur
|
cba3a3846f
|
Merge pull request #7790 from frederic34/facrecmodelpdf
NEW generate also document when invoice is build from recurring template
|
2017-11-11 17:42:26 +01:00 |
|
Laurent Destailleur
|
50ed463b9f
|
Merge pull request #7784 from frederic34/patch-3
account number on create bank account
|
2017-11-11 17:37:29 +01:00 |
|
Laurent Destailleur
|
d1860b87f8
|
NEW Add a confirmation for all mass action 'delete'
|
2017-11-11 16:34:11 +01:00 |
|
Maxime Kohlhaas
|
22a3721dda
|
Fix multi VAT deposit when special lines are in origin document
|
2017-11-11 16:10:06 +01:00 |
|
Maxime Kohlhaas
|
60fcddb9e4
|
NEW deposits can be converted even if unpaid
|
2017-11-11 12:07:55 +01:00 |
|
Laurent Destailleur
|
11cc82e6d2
|
Update doc
|
2017-11-10 10:15:50 +01:00 |
|
Frédéric FRANCE
|
5621e85c00
|
comment
|
2017-11-10 00:26:01 +01:00 |
|
Frédéric FRANCE
|
6f647f8a40
|
generate doc on cron jobs
|
2017-11-09 23:39:28 +01:00 |
|
Frédéric FRANCE
|
1ea6df14d0
|
Update card.php
|
2017-11-08 11:35:15 +01:00 |
|
Frédéric FRANCE
|
27ace14fb7
|
Fetch right account
|
2017-11-07 16:28:51 +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 |
|
Frédéric FRANCE
|
01a3787664
|
swap llxfooter() and $db->close()
|
2017-10-31 13:45:13 +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 |
|
atm-ph
|
c8871bffc9
|
Fix duplicate html id
|
2017-10-23 09:01:58 +02:00 |
|
Laurent Destailleur
|
c6e5115d34
|
Set default limit to 100 on all rest api that list
|
2017-10-22 15:42:19 +02:00 |
|
Laurent Destailleur
|
78ffe15a04
|
Code comment
|
2017-10-22 14:03:59 +02:00 |
|
Laurent Destailleur
|
83c1928034
|
Fix duplicate methods
|
2017-10-22 12:21:44 +02:00 |
|
Laurent Destailleur
|
c9fceaad3c
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/index.php
htdocs/fourn/facture/card.php
|
2017-10-22 04:04:26 +02:00 |
|
Laurent Destailleur
|
728e36f70f
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/api/index.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/api_invoices.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/actions_sendmails.inc.php
|
2017-10-22 01:43:33 +02:00 |
|
Frédéric FRANCE
|
735f06fd83
|
FIX #7675
|
2017-10-21 16:20:06 +02:00 |
|
Laurent Destailleur
|
1202853001
|
Fix syntax error
|
2017-10-19 19:12:00 +02:00 |
|
Laurent Destailleur
|
f7556e7ad2
|
FIX make of link to other object during creation
|
2017-10-19 19:06:48 +02:00 |
|
Laurent Destailleur
|
d4ade7b935
|
FIX API to get object does not return data o flinked objects
|
2017-10-19 17:57:16 +02:00 |
|
TuxGasy
|
9c3805c0d5
|
Fix anchor after add line
|
2017-10-19 14:10:58 +02:00 |
|
Laurent Destailleur
|
cb089987ee
|
Fix code comment
|
2017-10-19 12:35:15 +02:00 |
|
Laurent Destailleur
|
93d16bf4d7
|
Fix several fixes in APIs
|
2017-10-19 12:30:36 +02:00 |
|
Laurent Destailleur
|
9c45e86a1c
|
Introduce main_doc into table of objects to know what is main doc.
Work on option PROPOSAL_USE_ONLINE_SIGN
|
2017-10-19 11:40:40 +02:00 |
|
atm-ph
|
0f35b361bc
|
Fix can't interact with recap data page
|
2017-10-19 10:42:11 +02:00 |
|
Laurent Destailleur
|
7f85d73001
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/card.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contrat/card.php
htdocs/expensereport/card.php
htdocs/fichinter/list.php
htdocs/fourn/commande/card.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/paiement/card.php
htdocs/livraison/card.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/societe/rib.php
htdocs/supplier_proposal/list.php
htdocs/user/card.php
|
2017-10-18 19:51:29 +02:00 |
|
Laurent Destailleur
|
8626d6279a
|
Fix perm to delete files
|
2017-10-18 17:21:30 +02:00 |
|
Laurent Destailleur
|
99239cbb38
|
Add API close to close an order
|
2017-10-18 15:34:03 +02:00 |
|
Laurent Destailleur
|
d40dda83cf
|
Add API "close" for proposals
Standardize code
|
2017-10-18 11:10:08 +02:00 |
|
Laurent Destailleur
|
d70c215ab8
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/bankentries.php
htdocs/fourn/facture/card.php
|
2017-10-17 11:14:58 +02:00 |
|
Laurent Destailleur
|
81e7f45200
|
FIX Stats on invoices show nothing
|
2017-10-17 11:08:49 +02:00 |
|
Laurent Destailleur
|
5937fba373
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-10-17 10:51:11 +02:00 |
|
Laurent Destailleur
|
8b140ab069
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-10-17 10:44:29 +02:00 |
|
Laurent Destailleur
|
ebe0664aff
|
Merge branch 'develop' into scrutinizer-patch-3
|
2017-10-16 20:54:15 +02:00 |
|
Laurent Destailleur
|
3b1b83a046
|
Look and feel v6
|
2017-10-16 20:53:23 +02:00 |
|
Laurent Destailleur
|
0b83513fe0
|
Merge pull request #7635 from papoteur-mga/develop
Add Autofill button for amount to pay in charge payment page
|
2017-10-16 20:26:53 +02:00 |
|
Laurent Destailleur
|
45ac8367bd
|
NEW Add API for contracts
|
2017-10-16 17:56:59 +02:00 |
|
Scrutinizer Auto-Fixer
|
bd5bffa72c
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2017-10-16 06:47:05 +00:00 |
|
Papoteur
|
75835dd7fd
|
Add Autofill button for amount to pay in charge payment page
|
2017-10-15 13:33:48 +02:00 |
|
Laurent Destailleur
|
b491d22c16
|
FIX selection of thirdparty was lost on stats page of invoices
|
2017-10-14 02:30:33 +02:00 |
|
Laurent Destailleur
|
56e27d785a
|
CSS on report
|
2017-10-14 01:03:59 +02:00 |
|
Laurent Destailleur
|
b90770c30c
|
NEW Can rename (so reorder) bank receipts
|
2017-10-13 23:38:57 +02:00 |
|
Laurent Destailleur
|
d06f260b94
|
Fix amount format
|
2017-10-13 23:13:26 +02:00 |
|
Laurent Destailleur
|
07d16afe3b
|
Save one space
|
2017-10-13 23:10:40 +02:00 |
|
Laurent Destailleur
|
c014786446
|
NEW On reconciliation, show balance including all reconciliated fields
|
2017-10-13 23:07:27 +02:00 |
|
Laurent Destailleur
|
4296df45af
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/projet/list.php
htdocs/user/card.php
|
2017-10-13 22:01:56 +02:00 |
|
Laurent Destailleur
|
4b43faf0c1
|
Fix lose filter
|
2017-10-13 21:44:38 +02:00 |
|