Regis Houssin
|
d5b7184c8d
|
Fix: wrong test
|
2018-02-04 09:04:15 +01:00 |
|
Regis Houssin
|
a161ca37ff
|
Fix: use product_type instead special_code
|
2018-02-04 08:58:31 +01:00 |
|
Regis Houssin
|
c1e6d88442
|
Fix: use product_type instead special_code
|
2018-02-04 08:55:51 +01:00 |
|
Laurent Destailleur
|
6de2a08d70
|
Fix scrutinizer bugs
|
2018-02-03 19:10:52 +01:00 |
|
Laurent Destailleur
|
d3a6342034
|
Fix regeneration of PDF after creation of payment.
|
2018-02-02 10:37:10 +01:00 |
|
Regis Houssin
|
38d735341c
|
Fix: remove lines with special code when convert to reduc
|
2018-02-02 10:24:16 +01:00 |
|
Regis Houssin
|
2147bd23e6
|
Fix: remove lines with special code when convert to reduc
|
2018-02-02 10:22:47 +01:00 |
|
Laurent Destailleur
|
74a34acf77
|
Tab vs space
|
2018-02-01 02:14:17 +01:00 |
|
Laurent Destailleur
|
9c6b6f244c
|
Fix tooltip on invoice
|
2018-02-01 01:25:45 +01:00 |
|
Laurent Destailleur
|
e208e5b8a7
|
Fix look and feel v7
|
2018-01-29 21:27:46 +01:00 |
|
Laurent Destailleur
|
491e64db06
|
Fix various payments
|
2018-01-29 19:07:42 +01:00 |
|
Laurent Destailleur
|
4eb7d7a332
|
Debug blockedlog with various payments
|
2018-01-29 18:22:26 +01:00 |
|
Laurent Destailleur
|
8ae25b3c65
|
Fix the FACTURE_ENABLE_NEGATIVE was useless without
FACTURE_ENABLE_NEGATIVE_LINES
|
2018-01-29 16:21:54 +01:00 |
|
Laurent Destailleur
|
3a4ca8ae2b
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-01-24 11:49:36 +01:00 |
|
De Coninck Laurent
|
53ac13c792
|
check on type replacement #8028
|
2018-01-23 18:03:29 +01:00 |
|
arnaud
|
c0481be8d8
|
FIX subject mail sepa
|
2018-01-23 17:01:03 +01:00 |
|
arnaud
|
19c616756a
|
FIX email sent was not in HTML
|
2018-01-23 12:14:22 +01:00 |
|
atm-ph
|
054d98a2ba
|
Fix each total isn't aligned on payment card
|
2018-01-22 17:09:17 +01:00 |
|
Laurent Destailleur
|
7a1a2cf90d
|
Fix send into ledger for bank line record. Show accounted status.
|
2018-01-22 04:13:29 +01:00 |
|
Laurent Destailleur
|
abdf587fb5
|
Fix link to expert accounting no visible if module off
|
2018-01-20 12:12:36 +01:00 |
|
De Coninck Laurent
|
4874d08062
|
fix the bill replacement with discounts #8028
|
2018-01-19 09:01:37 +01:00 |
|
Laurent Destailleur
|
d967527b58
|
Fix status was not refreshed
|
2018-01-18 18:40:01 +01:00 |
|
Laurent Destailleur
|
768c93a707
|
Fix suggested amount for direct debit order
|
2018-01-18 18:22:10 +01:00 |
|
Laurent Destailleur
|
1730feeb4f
|
Fix error message
|
2018-01-18 17:52:48 +01:00 |
|
Laurent Destailleur
|
57f664c0c1
|
Fix vat npr for template invoices
|
2018-01-17 19:45:23 +01:00 |
|
Laurent Destailleur
|
56d702e3c6
|
Fix missing property in tooltip
|
2018-01-17 16:26:24 +01:00 |
|
Laurent Destailleur
|
a84ed841cc
|
Fix creation date was not filled
|
2018-01-16 20:47:33 +01:00 |
|
Laurent Destailleur
|
26ba0a9ec2
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/cashdesk/index.php
htdocs/compta/index.php
htdocs/core/lib/security.lib.php
htdocs/societe/list.php
|
2018-01-16 20:23:32 +01:00 |
|
atm-quentin
|
6feacab4f5
|
FIX missing hook invoice index
|
2018-01-15 14:24:19 +01:00 |
|
Laurent Destailleur
|
aa1692483f
|
Fix colspan
|
2018-01-13 16:06:04 +01:00 |
|
Laurent Destailleur
|
d0680b429f
|
Fix name of file saved from tax document tab
|
2018-01-12 17:39:20 +01:00 |
|
Laurent Destailleur
|
8b972313ae
|
Fix scrutinizer
|
2018-01-12 15:38:53 +01:00 |
|
Laurent Destailleur
|
64ae70d106
|
Fix scrutinizer bug
|
2018-01-12 15:20:17 +01:00 |
|
Laurent Destailleur
|
3423d4e6d3
|
Fix balance is amount after, so i fix by adding amount before
|
2018-01-12 13:35:53 +01:00 |
|
Laurent Destailleur
|
95d2a9f88d
|
Responsive and css
|
2018-01-12 01:10:03 +01:00 |
|
Laurent Destailleur
|
b225a6f79c
|
Better translation
|
2018-01-11 20:19:53 +01:00 |
|
Laurent Destailleur
|
e56d74f5c4
|
Fix generation of doc for supplier payment
|
2018-01-11 19:01:47 +01:00 |
|
Laurent Destailleur
|
e152e81d18
|
Fix close code
|
2018-01-11 18:24:40 +01:00 |
|
Laurent Destailleur
|
0b893c11fd
|
Revert "Fix wrong address used into PDF model of supplier payment"
This reverts commit 22d92c0540.
|
2018-01-11 18:09:05 +01:00 |
|
Laurent Destailleur
|
af6b84ba3a
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/list.php
htdocs/contact/document.php
htdocs/product/list.php
|
2018-01-11 01:03:13 +01:00 |
|
Laurent Destailleur
|
9827358002
|
Merge pull request #8040 from atm-florian/dev_fixsecu
fix #7963
|
2018-01-11 00:44:45 +01:00 |
|
Laurent Destailleur
|
436b653fa0
|
Error report
|
2018-01-11 00:16:45 +01:00 |
|
Laurent Destailleur
|
43d560830c
|
Fix on old php
|
2018-01-10 13:20:43 +01:00 |
|
Laurent Destailleur
|
bc9fc2828a
|
Fix missing class
|
2018-01-10 10:42:36 +01:00 |
|
Laurent Destailleur
|
9f79ad800b
|
Fix price per quantity
|
2018-01-09 14:20:47 +01:00 |
|
florian HENRY
|
fdedd6f75b
|
fix 7963
|
2018-01-08 20:54:40 +01:00 |
|
atm-ph
|
22d92c0540
|
Fix wrong address used into PDF model of supplier payment
|
2018-01-08 15:25:18 +01:00 |
|
Laurent Destailleur
|
42e659e26c
|
Fix link for online payment
|
2018-01-08 13:21:04 +01:00 |
|
Laurent Destailleur
|
b9015de7e2
|
Fix can't edit payment mode / default bank account
|
2018-01-05 19:52:23 +01:00 |
|
Laurent Destailleur
|
70cfec37b1
|
Fix add of free entry into bank account
|
2018-01-05 17:38:21 +01:00 |
|
Laurent Destailleur
|
5580cedfdc
|
Fix add of free entry into bank account
|
2018-01-05 17:35:28 +01:00 |
|
Laurent Destailleur
|
d7837f8800
|
Try fix for #7778
|
2018-01-05 01:43:51 +01:00 |
|
Laurent Destailleur
|
a3c6746b6f
|
Merge #8008 manually
|
2018-01-04 23:50:15 +01:00 |
|
Laurent Destailleur
|
1464937c66
|
Merge #8008 manually
|
2018-01-04 23:44:21 +01:00 |
|
Laurent Destailleur
|
f19fb90ab0
|
Merge #8008 manually
|
2018-01-04 23:36:14 +01:00 |
|
Laurent Destailleur
|
300d4e1603
|
Fix disable direct debit request for replaced invoices
|
2018-01-04 14:35:02 +01:00 |
|
Laurent Destailleur
|
6bc8268dc5
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
|
2018-01-03 23:35:15 +01:00 |
|
Laurent Destailleur
|
534cbcb941
|
Debug translation
|
2018-01-03 20:59:35 +01:00 |
|
John
|
1331e8add7
|
fix filter for TYPE_SITUATION invoice
|
2018-01-02 17:19:42 +01:00 |
|
Laurent Destailleur
|
b0fefffcf8
|
Fix standardize api code
|
2017-12-28 12:44:15 +01:00 |
|
Laurent Destailleur
|
6676178435
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/contact/list.php
htdocs/contrat/card.php
|
2017-12-28 09:56:40 +01:00 |
|
Laurent Destailleur
|
bbcf70cf4e
|
Remove spaces
|
2017-12-28 09:48:41 +01:00 |
|
Laurent Destailleur
|
3ac413084f
|
Merge branch '6.0' into 6.0
|
2017-12-28 08:46:22 +01:00 |
|
Laurent Destailleur
|
de305cb3b2
|
Merge pull request #7980 from hregis/6.0_bug2
Fix: avoid php warning
|
2017-12-28 06:53:09 +01:00 |
|
Ferran Marcet
|
1c7b99d3dc
|
Fix: Missing include for Project class
|
2017-12-26 12:13:35 +01:00 |
|
Laurent Destailleur
|
493669e986
|
Fix look and feel v7
|
2017-12-22 14:19:12 +01:00 |
|
Laurent Destailleur
|
aad0da2513
|
Fix maxi debug of APIs (clean output fields)
|
2017-12-21 16:50:18 +01:00 |
|
Laurent Destailleur
|
eab44f62b1
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/actions_builddoc.inc.php
htdocs/core/class/html.form.class.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/core/tpl/admin_extrafields_edit.tpl.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/notes.tpl.php
htdocs/main.inc.php
htdocs/product/inventory/tpl/inventory.tpl.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
|
2017-12-21 14:35:33 +01:00 |
|
Laurent Destailleur
|
6a62e13960
|
FIX security vulnerability reported by ADLab of Venustech
|
2017-12-21 13:32:16 +01:00 |
|
Laurent Destailleur
|
9ea2fe226d
|
Fix look and feel v6
|
2017-12-20 19:30:30 +01:00 |
|
Laurent Destailleur
|
9d10eb57f2
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
dev/dolibarr_changes.txt
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/main.inc.php
|
2017-12-20 13:28:41 +01:00 |
|
Regis Houssin
|
2821459894
|
Fix: avoid php warning
|
2017-12-20 11:36:51 +01:00 |
|
Laurent Destailleur
|
d51ae72eb4
|
Merge pull request #7965 from Oeris/develop-api
NEW improvements of invoices, orders and proposals in the REST API
|
2017-12-19 18:17:48 +01:00 |
|
Laurent Destailleur
|
57603e3df4
|
Update api_invoices.class.php
|
2017-12-19 18:16:39 +01:00 |
|
Laurent Destailleur
|
bffed79132
|
Update api_invoices.class.php
|
2017-12-19 18:06:05 +01:00 |
|
Laurent Destailleur
|
29b9fb6f54
|
Merge pull request #7964 from aspangaro/8.0-a1
NEW : Add search on date and accounting account in various payment list
|
2017-12-19 17:58:26 +01:00 |
|
Neil Orley
|
a3f4066790
|
NEW Update bank account when updating an invoice
Add the ability to update the bankaccount when updating an invoice
|
2017-12-19 14:14:26 +01:00 |
|
Neil Orley
|
fe8fac9577
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api
|
2017-12-19 12:36:46 +01:00 |
|
Laurent Destailleur
|
fcf04c122f
|
Fix phpcs
|
2017-12-19 00:39:01 +01:00 |
|
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 |
|