Commit Graph

44758 Commits

Author SHA1 Message Date
phf
d66bc6f1b3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_numbering_module_supplier_payment
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2016-02-06 12:57:30 +01:00
Laurent Destailleur
2e1011ca0c Add hidden option MAIN_CAN_HIDE_EXTRAFIELDS to disable a feature that
seems useless.
2016-02-06 12:29:02 +01:00
Laurent Destailleur
cb66448148 Merge pull request #4564 from atm-ph/new_feature_hidden_extrafields
NEW feature hidden extrafields
2016-02-05 17:22:51 +01:00
Laurent Destailleur
e1da95871a Fix bad name 2016-02-05 12:23:16 +01:00
Laurent Destailleur
04043cdb31 Merge pull request #4569 from abcnet-lu/raisons-socials-luxembourg
Fix: legal forms and professional IDs in Luxembourg
2016-02-05 10:58:03 +01:00
Laurent Destailleur
d66d3c0a8f Merge pull request #4567 from defrance/patch-98
Add odt & pdf edition on product
2016-02-05 10:57:49 +01:00
Laurent Destailleur
876bc2537c Merge pull request #4563 from atm-ph/fix_develop_list_socpeople
FIX list of contact
2016-02-05 10:55:01 +01:00
Laurent Destailleur
807e7b8304 Merge pull request #4560 from abcnet-lu/revert-develop-20160203
Fix : Add districts and cantons for Luxembourg
2016-02-05 10:53:51 +01:00
Laurent Destailleur
8e7b560cea Merge pull request #4562 from atm-ph/fix_formpropal_infinite_loop
FIX infinite loop
2016-02-05 10:51:49 +01:00
Laurent Destailleur
f518ef58bb Merge pull request #4557 from abcnet-lu/develop
Fix: Inverted labels of intermediary / reduced VAT rates for Luxembourg
2016-02-05 10:51:18 +01:00
Laurent Destailleur
5a2647906e Merge pull request #4530 from defrance/patch-96
Add hook on contacttpl
2016-02-05 10:50:40 +01:00
phf
a8e480e392 FIX #3509 payment ref for suppliers 2016-02-04 23:15:06 +01:00
phf
32c0b2a9b1 NEW add html id/class to locate value in the DOM html 2016-02-04 21:05:19 +01:00
phf
7e3a787688 FIX phpcs 2016-02-04 19:03:25 +01:00
BENKE Charlie
87c5854382 just change for rerun travis cheking 2016-02-04 16:58:19 +01:00
abcnet-lu
1e9ea4f2ac [#4568] Add professional IDs for Luxembourg 2016-02-04 16:40:49 +01:00
BENKE Charlie
0517435797 add product document generation 2016-02-04 16:21:27 +01:00
BENKE Charlie
db0c8740b9 add administration feature of products docs 2016-02-04 16:17:45 +01:00
BENKE Charlie
f87bfffdd9 add edition feacture on product element 2016-02-04 16:12:00 +01:00
abcnet-lu
490f3eaf82 [#4566] Add legal forms for Luxembourg 2016-02-04 14:41:26 +01:00
phf
0c05342934 FIX infinite loop 2016-02-03 22:54:48 +01:00
phf
7b456d23f0 FIX if we add extrafield on socpeople we got sql error on the list of contact 2016-02-03 22:53:15 +01:00
phf
75c4888364 NEW feature hidden extrafields 2016-02-03 22:49:43 +01:00
abcnet-lu
d430676e51 [Close] [#4558] Add districts and cantons for Luxembourg 2016-02-03 12:14:26 +01:00
abcnet-lu
d65ee22529 [Close] [#4555] Update label of intermediary VAT rate for Luxembourg (fix inverted labels) 2016-02-03 09:27:48 +01:00
Laurent Destailleur
47e2e33fb7 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/menus/init_menu_auguria.sql
2016-02-03 03:27:17 +01:00
Laurent Destailleur
19300a2d82 Fix warning when javascript disabled 2016-02-03 03:10:58 +01:00
Laurent Destailleur
f4d04b8f26 FIX part of #4227 2016-02-03 02:41:07 +01:00
Laurent Destailleur
6f1ddd3ba4 Fix on ref not correctly initialized. 2016-02-03 02:29:19 +01:00
Laurent Destailleur
d85f7be1f5 FIX #4423 2016-02-03 02:06:12 +01:00
Laurent Destailleur
165771b652 FIX #4439 2016-02-03 01:46:30 +01:00
Laurent Destailleur
229199aaad FIX #4497 2016-02-03 01:32:50 +01:00
Laurent Destailleur
ee4b437bff Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-03 01:20:23 +01:00
Laurent Destailleur
bbf15d6a5d FIX #4498 2016-02-03 01:20:06 +01:00
Laurent Destailleur
547ffd7fcc Add missing phpunit tests 2016-02-02 17:26:14 +01:00
Laurent Destailleur
1548be2614 Merge pull request #4549 from FHenry/3.9
Accountancy module
2016-02-02 17:15:01 +01:00
Laurent Destailleur
d88cd500ce Merge pull request #4547 from bafbes/dev1
fix:remove project info in standard document model for expense reports when project module is disabled
2016-02-02 16:41:12 +01:00
Laurent Destailleur
392d75b89e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-02-02 16:33:00 +01:00
Laurent Destailleur
c28c8d5d18 Add more info into log 2016-02-02 16:32:47 +01:00
Laurent Destailleur
1fb1da5be4 Work on website module 2016-02-02 16:24:12 +01:00
Laurent Destailleur
82cc0b409c Merge pull request #4546 from bafbes/bra
provide link section in expense reports and add option for intervention
2016-02-02 16:17:25 +01:00
Laurent Destailleur
55c3728923 Merge pull request #4540 from defrance/patch-97
bad id on restricted aera
2016-02-02 15:56:54 +01:00
Laurent Destailleur
325c35d355 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-02 15:39:44 +01:00
Laurent Destailleur
0def82f596 Merge pull request #4543 from aspangaro/develop-export
New: Add User accountancy code in user export
2016-02-02 15:32:56 +01:00
Laurent Destailleur
43ac8b72a3 Merge pull request #4542 from aspangaro/3.9-p9
New accountancy menu for auguria
2016-02-02 15:32:32 +01:00
Laurent Destailleur
47b63f7aff Merge pull request #4534 from bafbes/patch-17
Delete empty row in select list of vats in expenses
2016-02-02 15:10:56 +01:00
Laurent Destailleur
687afeaffe FIX No project fields if module disabled 2016-02-02 15:09:01 +01:00
Laurent Destailleur
f28d8669d9 Fix: no change of data ref. 2016-02-02 14:43:19 +01:00
Laurent Destailleur
335914ed3e Merge pull request #4554 from abcnet-lu/develop
Fix: Update VAT rates + label of intermediary VAT rate for Luxembourg
2016-02-02 14:41:41 +01:00
Florian HENRY
9298f167a7 Fix Travis 2016-02-02 12:32:25 +01:00