Commit Graph

48364 Commits

Author SHA1 Message Date
aspangaro
d1111f9b90 Merge remote-tracking branch 'Upstream/develop' into develop-51 2015-07-04 15:01:11 +02:00
aspangaro
556db60f22 Fix: md_exp borders have different colors 2015-07-04 14:59:20 +02:00
Laurent Destailleur
d5a4a98c22 FIX #3138 - Too much visible thing when access is denied on public pages 2015-07-04 14:56:43 +02:00
Laurent Destailleur
251fedad48 NEW Can edit email template using WYSIWYG editor 2015-07-04 11:57:55 +02:00
Laurent Destailleur
45d27ae250 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-04 10:50:57 +02:00
Laurent Destailleur
e9b6a6a61e NEW Add filter on status on invoice list 2015-07-04 10:50:41 +02:00
Laurent Destailleur
56560d9379 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-04 10:49:01 +02:00
Laurent Destailleur
ab01c40978 Merge pull request #3143 from marcosgdf/more-oop
Created function SupplierInvoiceLine::fetch and SupplierInvoiceLine::delete
2015-07-04 04:44:46 +02:00
Laurent Destailleur
42b4eaaeed Merge pull request #3142 from hregis/develop_new
New: possibility to defined a tab for all entities in module descriptor
2015-07-04 04:43:40 +02:00
Laurent Destailleur
b7715635a0 Merge pull request #3139 from aspangaro/develop-patch50
Disable button add a line in bank module when accountancy module is activated
2015-07-04 04:42:37 +02:00
Laurent Destailleur
9321272838 Uniformize code 2015-07-04 04:34:14 +02:00
Laurent Destailleur
3520c94641 Merge pull request #3131 from atm-maxime/check_rejection
New : Check rejection management
2015-07-04 04:20:58 +02:00
Laurent Destailleur
7ad4d9056d Merge pull request #3117 from All-3kcis/patch-2
Correct display of hours and minutes after action "Order"
2015-07-04 04:14:12 +02:00
Laurent Destailleur
5015eb8a88 Merge pull request #3126 from aspangaro/develop-patch48
Fix travis
2015-07-04 04:13:32 +02:00
Laurent Destailleur
47f9184382 Merge pull request #3114 from aspangaro/develop-patch46
Forms are using the tab look, even in creation mode
2015-07-04 04:13:21 +02:00
Laurent Destailleur
bddee5d01f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-04 04:11:30 +02:00
Laurent Destailleur
5fafb08f91 Uniformize code 2015-07-04 04:11:16 +02:00
Laurent Destailleur
19158979ac Merge pull request #3122 from ywarnier/tva2
Updates and additions to VAT reports
2015-07-04 04:05:04 +02:00
Laurent Destailleur
9eff436f5c Merge pull request #3136 from alainabbas/develop
Correct bug #3050
2015-07-04 03:45:46 +02:00
Laurent Destailleur
55dbc2dfe2 Merge pull request #3115 from sebhm/develop
add hook addMoreActionsButtons
2015-07-04 03:43:08 +02:00
Laurent Destailleur
97524687c7 Merge pull request #3113 from aspangaro/develop-patch44
Add getNomUrl on accounting for an account
2015-07-04 03:40:30 +02:00
Laurent Destailleur
a49c9c299e Merge pull request #3102 from aspangaro/develop-patch42
HRM area : Show Ref instead of id for expense report
2015-07-04 03:40:13 +02:00
Laurent Destailleur
9c80735310 An easier to use dictionary page to edit email template.
Uniformize look.
2015-07-04 03:28:52 +02:00
Laurent Destailleur
0ac43211ad NEW: Add help tooltips on fields of dictionary edit pages.
Fix: visible list of tasks are for opened project only.
2015-07-04 02:08:06 +02:00
aspangaro
4627e72f59 Debug && PSR2 2015-07-04 00:01:40 +02:00
Marcos García de La Fuente
9415bdd828 Created function SupplierInvoiceLine::fetch and SupplierInvoiceLine::delete 2015-07-03 19:17:45 +02:00
Laurent Destailleur
f320310304 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-03 16:24:17 +02:00
Laurent Destailleur
22bac55d32 Push partial lang 2015-07-03 16:23:56 +02:00
Laurent Destailleur
f06b66c5f0 Sync from transifex 2015-07-03 15:31:51 +02:00
Laurent Destailleur
5db5a8a1fa No need of option all. Reference is now transifex. 2015-07-03 13:48:54 +02:00
Regis Houssin
e9aa98fb9d Fix: travis 2015-07-03 11:40:59 +02:00
Regis Houssin
b70dfd0d54 New: possibility to defined a tab for all entities in module descriptor 2015-07-03 11:16:24 +02:00
aspangaro
111e44493a Disable button add a line in bank module when accountancy module is activated 2015-07-03 06:48:49 +02:00
Laurent Destailleur
312281f4d4 Debug askpricesupplier
Try to continue work on position of menu entries.
2015-07-02 22:43:51 +02:00
Laurent Destailleur
196a745086 NEW Can filter proposal, orders or invoices with criteria "contain at
least one product with following tag"
2015-07-02 22:07:13 +02:00
Maxime Kohlhaas
84be022ee1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into check_rejection
Conflicts:
	htdocs/compta/paiement/cheque/card.php
2015-07-02 13:45:32 +02:00
aspangaro
39dbec144a Correct travis 2015-07-02 05:15:54 +02:00
Laurent Destailleur
6ef0b8e330 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-01 21:17:05 +02:00
Yannick Warnier
3a8c93522f Convert " " to \t to match custom coding conventions 2015-06-30 15:53:58 -05:00
Yannick Warnier
486a1547df Add language terms for extended VAT quarterly report 2015-06-30 15:51:24 -05:00
Yannick Warnier
c9e3cf9fa9 Introduce checkbox for extended customers VAT report 2015-06-30 15:50:35 -05:00
Yannick Warnier
066a7acbaa Minor - Improve PSR-2 support 2015-06-30 15:42:55 -05:00
Yannick Warnier
6cb69cdaba Minor - Fix date column title 2015-06-30 15:42:08 -05:00
Yannick Warnier
f0db9a3c3b Add non-local and local-only VAT customers reports to new quarterly report 2015-06-30 15:41:56 -05:00
Yannick Warnier
c3bb76340f Improve extended quaterly VAT report 2015-06-30 15:41:00 -05:00
Yannick Warnier
0cfd513b8c Add extended quaterly VAT report with additional information on dates and customers/suppliers 2015-06-30 15:39:15 -05:00
Yannick Warnier
8e974d024b Fix broken old queries in VAT's quadri.php 2015-06-30 15:37:22 -05:00
Laurent Destailleur
b766f99acc Uniformize look.
Make code to manage link "Now" on calendar more generic.
2015-06-30 21:50:24 +02:00
Laurent Destailleur
57a267a30f NEW Add hooks to allow an external module to complete list of events
into calendar views.
2015-06-30 17:09:52 +02:00
Laurent Destailleur
276f057acf Clean trigger codes
Better error message when we insert duplicate barcode.
2015-06-30 16:10:03 +02:00