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

8097 Commits

Author SHA1 Message Date
John
5624257a6d add new dom html5 elements and class 2018-02-20 16:49:49 +01:00
Laurent Destailleur
7f419a29e7
Merge pull request #8072 from laudeco/hotfix/8028_replacement_bill 
fix the bill replacement with discounts #8028
 2018-02-20 15:19:19 +01:00
Laurent Destailleur
b361877ea8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/card.php
 2018-02-20 12:48:28 +01:00
Marc de Lima Lucio
95be155010 FIX: supplier credit notes: harmonize discount filters 2018-02-20 12:26:29 +01:00
Laurent Destailleur
32e8bab20d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-20 11:01:20 +01:00
Laurent Destailleur
16fca2ee35 Fix bad link 2018-02-20 10:05:11 +01:00
Marc de Lima Lucio
44b0d1ca0f Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-02-19 17:33:20 +01:00
Marc de Lima Lucio
a66f7b8bc8 FIX: supplier credit notes: wrong discount filters 2018-02-19 17:32:59 +01:00
Laurent Destailleur
d233c152a7 Code comment 2018-02-16 14:18:05 +01:00
Marc de Lima Lucio
e2b65b3755 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note 2018-02-16 09:14:53 +01:00
John
49bad95d31 fix method exist test 2018-02-15 17:04:27 +01:00
John
63987fa32e fix invoice extrafield transmition to credit 2018-02-15 16:39:47 +01:00
Laurent Destailleur
6b74c79798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-02-15 15:34:17 +01:00
Laurent Destailleur
47713e0264 Fix bug reported by scrutinizer 2018-02-15 15:32:43 +01:00
Laurent Destailleur
13dd440fd4 FIX #8192 2018-02-15 14:47:08 +01:00
Laurent Destailleur
f1a9f81fb4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-02-14 22:19:59 +01:00
Laurent Destailleur
4e145f0e5b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-14 22:09:12 +01:00
Laurent Destailleur
7f8cbc0f62 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/adherents/type.php
	htdocs/contrat/services.php
	htdocs/contrat/tpl/linkedobjectblock.tpl.php
	htdocs/install/upgrade2.php
 2018-02-14 22:08:18 +01:00
Laurent Destailleur
06357e62da
Merge pull request #8182 from laudeco/hotfix/bank_module 
Bank module is not accessible (error 500) since 7.0.0
 2018-02-14 20:52:36 +01:00
Laurent Destailleur
3780a8b1d9
Merge branch 'develop' into new_charges_sociales_trigger 2018-02-14 20:48:16 +01:00
Laurent Destailleur
ea2e46cccd
Update chargesociales.class.php 2018-02-14 20:46:40 +01:00
Marc de Lima Lucio
4f9bb33600 NEW: supplier credit notes: convert to usable absolute discount + link/unlink to supplier invoice + create supplier credit note from excess paid 2018-02-14 10:47:10 +01:00
atm-ph
c690dfb258 Fix apply global progress don't update multicurrency values 2018-02-14 10:15:38 +01:00
De Coninck Laurent
6f7d6f977b fix error in latest release 2018-02-12 15:50:14 +01:00
ATM-Nicolas
d762226a70 FIX : Call to trigger on chargesociale create 2018-02-12 14:39:18 +01:00
Laurent Destailleur
fda5822d5a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 14:03:22 +01:00
Laurent Destailleur
30ba1c1702 FIX #8174 2018-02-12 14:02:51 +01:00
Laurent Destailleur
6bdb82cf27 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/class/api_thirdparties.class.php
 2018-02-12 04:15:47 +01:00
Laurent Destailleur
9b8b3a1236
Merge pull request #8176 from hregis/7.0_bug2 
Fix: wrong param name (Travis error !)
 2018-02-12 03:25:23 +01:00
Laurent Destailleur
109c447171 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 03:21:37 +01:00
Laurent Destailleur
975608b9d3 FIX #8174 2018-02-12 03:21:04 +01:00
Laurent Destailleur
fa3b1c74a9 Fix bad link 2018-02-12 02:25:34 +01:00
Laurent Destailleur
1300f7172f NEW Can fix the bank account of a payment if payment not conciliated 2018-02-12 02:17:52 +01:00
Laurent Destailleur
1a6cff8fee Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 01:28:14 +01:00
Laurent Destailleur
b7b496132b Fix syntax error 2018-02-12 01:27:54 +01:00
Regis Houssin
2b7693c582 Fix: wrong param name (Travis error !) 2018-02-11 12:14:23 +01:00
Laurent Destailleur
26ee7ec5be Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2018-02-08 17:27:36 +01:00
Laurent Destailleur
d10d9f0fb2 Fix scrutinizer 2018-02-08 17:22:07 +01:00
Laurent Destailleur
19a0f552c9 Fix td balance 2018-02-08 16:50:01 +01:00
Laurent Destailleur
493a9a7289 Fix td balance 2018-02-08 16:49:28 +01:00
Laurent Destailleur
a200a7f149 Fix look and feel v7 2018-02-08 16:43:10 +01:00
Laurent Destailleur
cc20a9d1d5 FIX #8079 2018-02-08 16:43:05 +01:00
Laurent Destailleur
490e093926 Fix look and feel v7 2018-02-08 16:41:50 +01:00
Laurent Destailleur
91bed7c014 FIX #8079 2018-02-08 16:13:12 +01:00
Laurent Destailleur
eccdc9a075 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/langs/pt_PT/companies.lang
 2018-02-08 15:20:24 +01:00
Laurent Destailleur
2b2e68c78d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/societe/card.php
 2018-02-08 15:18:28 +01:00
Laurent Destailleur
39cd63e2d4
Merge pull request #8143 from simnandez/6.0 
FIX: Withdrawals lines not filter by company name and not respect dropdown limit lines by page
 2018-02-08 14:07:14 +01:00
Laurent Destailleur
ab21769aa2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/card.php
 2018-02-08 12:58:47 +01:00
Laurent Destailleur
c988d3f1cc Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/facture.php
 2018-02-08 12:53:26 +01:00
Juanjo Menent
9b56555962 FIX: Withdrawals lines not filter by company name and not respect dropdown limit lines by page 2018-02-06 18:49:29 +01:00
Laurent Destailleur
ea92f6beae Fix for multicompany 2018-02-06 10:57:53 +01:00
Laurent Destailleur
074f4a3b46 Fix class not found when selecting project ref in lists 2018-02-06 00:34:14 +01:00
Laurent Destailleur
c2590b9c7e Fix: complete labels of operation if bank journal 
Conflicts:
	htdocs/compta/tva/class/tva.class.php
 2018-02-05 17:10:18 +01:00
Laurent Destailleur
ad384a9992 Fix default sort order 2018-02-05 17:08:47 +01:00
Laurent Destailleur
47cb9aef50 Fix: complete labels of operation if bank journal 2018-02-05 17:07:38 +01:00
Laurent Destailleur
a8ad9fb77d Fix default sort order 2018-02-05 16:28:25 +01:00
Laurent Destailleur
51847dfa8a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2018-02-05 15:34:50 +01:00
Laurent Destailleur
85964e02de Fix css 2018-02-05 12:34:11 +01:00
Laurent Destailleur
f229f34d05 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-05 01:34:08 +01:00
Laurent Destailleur
30c683ed65 Fix properties into tooltip 2018-02-05 00:36:54 +01:00
Laurent Destailleur
8fe773204e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-04 23:18:33 +01:00
Laurent Destailleur
5455ab3280 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/projet/card.php
 2018-02-04 23:17:09 +01:00
Laurent Destailleur
0cc6654b06 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2018-02-04 13:25:00 +01:00
Regis Houssin
8ee1186492 Fix: wrong test 2018-02-04 09:05:35 +01:00
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
2e705b5a88 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-02 10:41:20 +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
f51d6a2e50 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-02 10:07:16 +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
7f9d6a5458 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/paybox/newpayment.php
	htdocs/public/payment/newpayment.php
	htdocs/public/paypal/newpayment.php
	htdocs/public/stripe/newpayment.php
 2018-01-31 20:25:24 +01:00
Laurent Destailleur
fec551631e
Merge pull request #8066 from grandoc/new_push_16_01_2018 
NEW Add linked file tab to vat
 2018-01-29 21:28:14 +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
Philippe GRAND
cd0dc2dbde Add linked file tab to vat 2018-01-16 16:22: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
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
Laurent Destailleur
5a4480bd1d Fix navigation on bank receipts 2017-10-13 21:32:14 +02:00
Laurent Destailleur
afd83a4454 Fix navigation on bank receipts 2017-10-13 21:25:27 +02:00
Laurent Destailleur
c28dec8dc2 Fix balance no more visible 2017-10-13 21:04:20 +02:00
Scrutinizer Auto-Fixer
165741517e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-13 11:28:26 +00:00
Laurent Destailleur
d12019d1b5 Fix from scrutinizer 2017-10-13 13:10:36 +02:00
Laurent Destailleur
7c9993ef0e Various fixes 2017-10-13 12:14:57 +02:00
Laurent Destailleur
857b59409c FIX sql syntax error because of old field accountancy_journal 2017-10-13 01:50:00 +02:00
Laurent Destailleur
558f261b60 FIX #7593 2017-10-13 01:03:33 +02:00
Laurent Destailleur
8c5cf9ea45 Fix date output 2017-10-12 18:04:47 +02:00
Laurent Destailleur
45b4572ad4 Label shorter 2017-10-12 13:30:28 +02:00
gauthier
1e7676d26f FIX : wrong key in selectarray 2017-10-12 09:30:04 +02:00
Laurent Destailleur
ca0af5cddf NEW Bulk action validate on customer invoices 2017-10-12 02:25:17 +02:00
Laurent Destailleur
1d92e80788 Fix line addr in xml sepa file 2017-10-12 02:07:51 +02:00
Laurent Destailleur
08c94f11b6 FIX SEPA file if address is empty 2017-10-12 01:44:26 +02:00
Laurent Destailleur
dd15884f83 Fix recur - rcur 2017-10-12 01:35:04 +02:00
Laurent Destailleur
7c29bb5818 Fix must use differently FRST and SEPA 2017-10-12 01:24:19 +02:00
Laurent Destailleur
5f401839d6 Fix verif 2017-10-12 00:42:48 +02:00
Laurent Destailleur
15bcbc8b43 FIX Check on bank info for sepa must be done on iban/swift not on ban 2017-10-12 00:38:59 +02:00
Laurent Destailleur
31ab73ff3c Fix when verif is called several times 2017-10-12 00:12:26 +02:00
Laurent Destailleur
56e437a6c3 Bed fetch 2017-10-12 00:03:24 +02:00
Laurent Destailleur
5715f44fe6 Better error messages 2017-10-12 00:02:24 +02:00
Laurent Destailleur
d36af4a46a RUM number start with RUM- 2017-10-11 23:06:23 +02:00
Laurent Destailleur
b4018846e8 Merge pull request #7610 from atm-arnaud/FIX_search_conciliated_bankentries 
FIX bankentries search conciliated if val 0
 2017-10-11 11:54:21 +02:00
arnaud
fd796723f2 FIX bankentries search conciliated if val 0 2017-10-10 17:15:01 +02:00
Laurent Destailleur
084dc7798d Standardize use of function getCommonSubstitutionArray 2017-10-09 14:51:42 +02:00
Laurent Destailleur
8f24a86352 NEW If max nb of generation is reached, date for next gen is striked 2017-10-09 14:16:22 +02:00
Laurent Destailleur
4c23363400 Fix creation of tax payment 2017-10-07 21:27:18 +02:00
Laurent Destailleur
ad0fa3c33a Look and feel v6 2017-10-07 21:13:54 +02:00
Laurent Destailleur
8aa924fa08 NEW The bank account is visible on payment of taxes 2017-10-07 21:03:46 +02:00
Laurent Destailleur
e40bffb0d5 Fix bug reported by scrutinizer 2017-10-07 20:21:47 +02:00
Laurent Destailleur
af1d2bfffd Standardize code 2017-10-07 14:11:01 +02:00
Laurent Destailleur
762879b95b Merge pull request #7586 from Dolibarr/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2017-10-07 13:39:39 +02:00
Laurent Destailleur
1b399dc8dd Update api_invoices.class.php 2017-10-07 13:28:04 +02:00
Scrutinizer Auto-Fixer
328d39bc71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-07 11:09:31 +00:00
Neil Orley
925a86b2ba NEW Delete a line of invoice using the REST API 
Adds the ability to delete a line of an invoice using the REST API
Rename a post action with a "verb"
 2017-10-06 20:49:58 +02:00
Laurent Destailleur
f9d9642340 FIX #6981 2017-10-06 14:07:28 +02:00
Laurent Destailleur
06b18a740e NEW Add date of birth on user card. 
NEW Show expected worked hours on the timesheet form.
 2017-10-06 12:08:01 +02:00
Laurent Destailleur
7b1fe6e5af Look and feel v6 2017-10-06 11:02:44 +02:00
Laurent Destailleur
d28188d19d FIX Generation of invoice from bulk action "Bill Orders" 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2017-10-04 14:31:52 +02:00
Laurent Destailleur
a74d6074a3 FIX Generation of invoice from bulk action "Bill Orders" 2017-10-04 14:27:10 +02:00
Laurent Destailleur
436ec93084 FIX is_erasable report bad value when thirdparty was not loaded 2017-10-04 03:22:41 +02:00
Laurent Destailleur
a6cf934973 Add log 2017-10-04 02:46:01 +02:00
Laurent Destailleur
3a41f2bddb Fix test when numbering ref is only numeric char. 2017-10-04 01:27:19 +02:00
Laurent Destailleur
c08f33507f More accurate error code 2017-10-04 00:51:25 +02:00
Laurent Destailleur
8794e54eba Try to fix phpunit 2017-10-03 22:52:57 +02:00
Laurent Destailleur
c22cd1cfe9 Fix test on entity must always be done using the "IN" instead of "=" 2017-10-03 17:41:22 +02:00
Laurent Destailleur
f2e0ff0d30 Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict 2017-10-03 17:25:01 +02:00
Laurent Destailleur
b40012d08f Merge pull request #7535 from Oeris/develop-api 
NEW Set invoices as draft using the REST API
 2017-10-03 16:46:12 +02:00
Laurent Destailleur
2b2832da22 Add option FACTURE_PAYMENTS_ON_SUBSIDIARY_COMPANIES - Close #7548 2017-10-03 16:38:22 +02:00
Laurent Destailleur
a501a20487 NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00
Laurent Destailleur
9d6498f2a4 NEW Search filters in lists are restored when using "back to list" 2017-10-03 14:50:52 +02:00
Regis Houssin
e65b21a3bf Fix: change the parameter value of dol_getIdFromCode 2017-10-02 11:59:17 +02:00
Neil Orley
503129c9f4 Rename method draft and paid to settodraft and settopaid 2017-10-02 11:51:54 +02:00
Regis Houssin
09e71f1390 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-10-02 11:51:27 +02:00
Neil Orley
5b91a6a37b NEW Sets an invoice as paid using the REST API 
Adds the ability to set an invoice as paid using the REST API
 2017-10-02 11:17:46 +02:00
Neil Orley
91a1d6c17e NEW Set invoices as draft using the REST API 
Adds the ability to set an invoice status as draft using the REST API
Change response when validating an invoice: before returned 200 + text message, now returns an invoice object
 2017-10-02 10:55:34 +02:00
Laurent Destailleur
884fc5d249 Update facture.class.php 2017-10-02 01:25:00 +02:00
Laurent Destailleur
3f3a5e0921 Merge pull request #7499 from atm-gauthier/NEW_custom_meteo 
New custom meteo
 2017-10-02 00:48:52 +02:00
AXeL-dev
46800afac9 FIX: missing variables in payment form 2017-10-01 18:38:08 +01:00
AXeL-dev
5df0f4c2fd FIX: in payment form, label does not fill with GET method 2017-10-01 18:33:22 +01:00
Laurent Destailleur
fa6c3eff80 More PHPunit on invoice deletion 2017-09-30 12:53:24 +02:00
Regis Houssin
4a63e6b6ec Fix: two errors when you create invoice from shipping 2017-09-29 19:07:13 +02:00
Laurent Destailleur
f007f9e7e5 NEW Add new property visible dy default on lists on extrafields 2017-09-29 13:26:44 +02:00
Regis Houssin
9823d6622c Fix: use default $shared value 2017-09-27 17:40:02 +02:00
Regis Houssin
20684b4505 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/core/modules/rapport/pdf_paiement.class.php
	htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
 2017-09-27 17:22:18 +02:00
Laurent Destailleur
be60e66d62 Uniformsize code/options 2017-09-27 16:29:33 +02:00
Laurent Destailleur
f1a563625b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
 2017-09-26 22:11:00 +02:00
Laurent Destailleur
7178bf0132 Work on direct external link for dolibarr objects 2017-09-26 16:56:33 +02:00
gauthier
d270a8e009 FIX : same than precedent commit 2017-09-26 16:09:40 +02:00
gauthier
8de9c5cd36 FIX : forgotten php doc on function parameter 2017-09-26 14:18:26 +02:00
gauthier
7f938bc517 NEW : unexistant function load_state_board() on several objects 2017-09-26 12:32:58 +02:00
Laurent Destailleur
49982b36ac FIX #7490 2017-09-26 11:55:19 +02:00
Laurent Destailleur
dc362fcd30 NEW Can show currency in list of bank accounts 2017-09-25 18:11:03 +02:00
Laurent Destailleur
fcdbc66bb1 Merge pull request #7122 from atm-florian/develop_fixtransfert 
NEW : Can transfer from bank account to bank account with different currencies
 2017-09-25 17:36:52 +02:00
Regis Houssin
d592664150 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-09-25 06:48:26 +02:00
Laurent Destailleur
e3da4188e2 GETPOST must not clean data for text input. 2017-09-25 00:16:52 +02:00
Laurent Destailleur
3f9cae745c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-24 23:40:57 +02:00
Laurent Destailleur
af384f14ae FIX #7477 2017-09-24 23:40:42 +02:00
Laurent Destailleur
934edd9f5a Merge branch 'develop' into 6.0-api 2017-09-24 22:01:07 +02:00
Laurent Destailleur
ddefdd12fb Merge pull request #7460 from dvasseur/develop 
FIX: REST API, date field not used for invoices creation
 2017-09-24 21:56:41 +02:00
Laurent Destailleur
91d303465d NEW Can add html content on right of tabs 2017-09-24 01:39:06 +02:00
Neil Orley
9498fca5e1 Add of implementation notes with an exemple 2017-09-22 12:24:42 +02:00
Neil Orley
1aedc4a793 Change the term 'order' by 'invoice' 2017-09-22 12:18:11 +02:00
Neil Orley
ad6778a1cf NEW post lines of an invoice using the REST API 
Adds the ability to post a new lins in an invoice using the REST API
 2017-09-22 12:08:11 +02:00
Neil Orley
f985b1ede6 NEW GET lines of an invoice in the REST API 
Adds the ability to get lines of an invoice using the REST API
 2017-09-22 12:00:54 +02:00
Laurent Destailleur
bd45ea5a03 Split page for invoice template into card + list. Add more filters. 2017-09-22 11:28:53 +02:00
Laurent Destailleur
9875d20eaf Add more columns in list of invoices templates 2017-09-21 18:35:47 +02:00
David
9dab694bb0 FIX: REST API, date field not used for invoices creation 2017-09-21 17:48:12 +02:00
Laurent Destailleur
68c9d08909 Merge pull request #7438 from fappels/6.0_fix_extrafields_copy 
FIX extrafields copy situation invoice, shipment and receipt
 2017-09-20 17:36:48 +02:00
Laurent Destailleur
577c64cc37 WIP work on param download on payment page 2017-09-20 17:23:36 +02:00
Laurent Destailleur
04e1458a3f Fix clean parameters 2017-09-19 22:03:44 +02:00
Laurent Destailleur
8dfa87fcf6 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-19 19:30:28 +02:00
Laurent Destailleur
6a0ef4b561 Fix info ot total in direct debit page 2017-09-19 19:29:00 +02:00
Laurent Destailleur
f87614e2d3 Fix missing translation 2017-09-19 19:12:54 +02:00
Laurent Destailleur
ffe2ee8232 Standardize code 2017-09-19 19:00:28 +02:00
fappels
8123562ded Fix extrafield copy next situation invoice 2017-09-19 18:42:29 +02:00
Laurent Destailleur
f936b17d68 FIX Protection to avoid to apply credit note discount > remain to pay 2017-09-19 00:24:52 +02:00
Laurent Destailleur
9838199de1 FIX Sign of amount in origin currency on credit note created from lines 2017-09-18 23:53:17 +02:00
Regis Houssin
a03ef95eaa Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/install/mysql/tables/llx_c_payment_term.sql
 2017-09-18 09:11:04 +02:00
Laurent Destailleur
291a0d46e6 Fix edit of categories 2017-09-18 01:39:39 +02:00
Laurent Destailleur
3f7b705674 Use correct term accounting for codes 2017-09-18 00:48:09 +02:00
Laurent Destailleur
ab5724e7ff Mutualize code for forms to send emails. Remove thousand line of code. 2017-09-17 17:12:14 +02:00
Laurent Destailleur
e014ac6ea9 NEW Send by email available in bulk for expense report 2017-09-16 22:03:25 +02:00
Laurent Destailleur
b4eab24490 Add project into list of customer orders 2017-09-16 20:32:28 +02:00
Laurent Destailleur
0fec777d0e NEW On bulk email from a list, can uncheck "Join main document". 
NEW Show direct preview link on contract
 2017-09-16 18:31:30 +02:00
Laurent Destailleur
630dc92a13 NEW Mass PDF Merging is available on contracts 2017-09-16 15:39:52 +02:00
Laurent Destailleur
e56b41c1ae Clean code 2017-09-16 13:28:13 +02:00
Laurent Destailleur
ad40d27324 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2017-09-16 12:22:18 +02:00
Laurent Destailleur
ff7a17eb96 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/facture.php
 2017-09-16 12:17:30 +02:00
Laurent Destailleur
e4767b1a51 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture/fiche-rec.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2017-09-16 12:11:18 +02:00
Laurent Destailleur
4e7e6cc658 Fix W3C 2017-09-16 09:15:10 +02:00
Laurent Destailleur
59f644a3e2 FIX SEPA recording payment must save one payment in bank per customer 2017-09-15 18:39:10 +02:00
Regis Houssin
cbd8cb8cb7 Fix: missing merge conflict 2017-09-15 17:32:49 +02:00
Laurent Destailleur
17eec5f9e9 Fix look and field for direct debit notes 2017-09-15 17:23:41 +02:00
Regis Houssin
db17eb80ec Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/facture/class/paymentterm.class.php
 2017-09-15 16:45:49 +02:00
Laurent Destailleur
5e34b121dd Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
Laurent Destailleur
f5d2283093 USe second parameter in GETPOST 2017-09-15 10:52:53 +02:00
Laurent Destailleur
0873260b8a USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
Regis Houssin
a494e01f00 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-09-14 12:07:19 +02:00
Laurent Destailleur
8392158ee3 Update remisecheque.class.php 2017-09-14 12:06:41 +02:00
Stéphane BERTHELOT
93defa5f59 Fix dates in commande and remisecheque for PostgreSQL (should be treated like strings) 2017-09-14 12:06:25 +02:00
Laurent Destailleur
165c3ac112 Merge pull request #7374 from EmisFR/develop 
Fix dates in commande and remisecheque for PostgreSQL
 2017-09-14 12:05:51 +02:00
Laurent Destailleur
1cab73b605 Update remisecheque.class.php 2017-09-14 12:05:34 +02:00
Laurent Destailleur
eadfbfe2bd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions2.lib.php
 2017-09-13 20:57:53 +02:00
Laurent Destailleur
38621b622e Fix specimen not complete for multicompany 2017-09-13 20:11:51 +02:00
Laurent Destailleur
58b49f9a08 Fix position of field to avoid errors 2017-09-13 17:10:23 +02:00
Laurent Destailleur
149ab80b3a The event array of an object is visible even if no event yet recorded. 2017-09-13 14:18:36 +02:00
Laurent Destailleur
71ce82b6b9 NEW Better autoselect customer or supplier fields to save clicks 2017-09-12 16:51:10 +02:00
Laurent Destailleur
c5961d8386 Pass user to the delete function 2017-09-12 14:34:33 +02:00
Laurent Destailleur
531ebc4c48 Fix merge 2017-09-12 13:53:55 +02:00
Laurent Destailleur
f411476718 Fix default value of filter 2017-09-12 13:52:19 +02:00
Laurent Destailleur
a4665e17d4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/societe/class/societe.class.php
	htdocs/societe/list.php
 2017-09-12 13:26:25 +02:00
Laurent Destailleur
3001ee5fe7 Fix title of reports 2017-09-12 13:05:34 +02:00
Laurent Destailleur
d0a0bf57b6 NEW The "Show detail by account" accepts 3 values: yes, no, if non zero 2017-09-12 12:52:48 +02:00
Laurent Destailleur
627dd15b44 Suggested link for online payment use the generic link 2017-09-12 12:18:26 +02:00
Laurent Destailleur
cda8c6e41a Fix ref must be 50 2017-09-12 11:51:51 +02:00
Stéphane BERTHELOT
66f671f4c8 Fix dates in commande and remisecheque for PostgreSQL (should be treated like strings) 2017-09-11 18:01:24 +02:00
Laurent Destailleur
44405e5415 Fix #7335 #7365 Better fix 2017-09-11 15:04:29 +02:00
Laurent Destailleur
646e8713f2 Remove duplicated logs 2017-09-11 13:41:40 +02:00
Laurent Destailleur
b87ce172c3 FIX hidden option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN 2017-09-11 13:40:34 +02:00
Laurent Destailleur
59ab52c718 FIX hidden option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN 2017-09-11 13:39:03 +02:00
Regis Houssin
b5de8da3a6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/core/modules/modFacture.class.php
 2017-09-11 08:07:55 +02:00
Laurent Destailleur
9253207842 NEW template invoices support substition key 
__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__
__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__
 2017-09-11 02:11:31 +02:00
Laurent Destailleur
26385fa10d FIX Clean bad parameters when inserting line of template invoice 
Conflicts:
	htdocs/compta/facture/class/facture-rec.class.php
 2017-09-11 01:06:48 +02:00
Laurent Destailleur
86b28a01c7 FIX Clean bad parameters when inserting line of template invoice 2017-09-11 01:04:53 +02:00
Laurent Destailleur
2ae135baf1 NEW Add view of status of template invoice 2017-09-10 20:47:45 +02:00
Laurent Destailleur
e7abb39ee2 NEW Template invoices are visible on the customer tab 2017-09-10 19:28:20 +02:00
Laurent Destailleur
259cca0230 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/admin/mails_templates.php
 2017-09-08 13:30:54 +02:00
Laurent Destailleur
03fe9d4e97 Escape all status 2017-09-08 13:23:12 +02:00
fappels
7c743eb7da Rename $extrafields because already used 2017-09-07 21:04:15 +02:00
Laurent Destailleur
bde293af22 Fix filter on extrafield with type sellist 2017-09-07 15:34:25 +02:00
Regis Houssin
66e548427c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/resultat/clientfourn.php
	htdocs/core/lib/functions.lib.php
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-09-07 10:50:35 +02:00