lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,326 Commits 43 Branches 150 Tags 886 MiB
19158979ac
Commit Graph

48326 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Laurent Destailleur
c69a9996f1 Uniformize code 2015-06-30 15:12:15 +02:00
Laurent Destailleur
a29ca43943 Prepare merge of merge tools and invoice list 2015-06-30 14:32:17 +02:00
Laurent Destailleur
4a1dfa60a5 Uniformize code 2015-06-30 13:14:19 +02:00
Laurent Destailleur
a8f1066faa Fix support of option to manage opportunities 2015-06-30 01:53:01 +02:00
Laurent Destailleur
99874c4b0d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-30 01:34:26 +02:00
Laurent Destailleur
ae5b779652 Uniformize code 2015-06-30 01:34:17 +02:00
Laurent Destailleur
eed1d1527a NEW Into the overview of projects, the name of thirdparty appears into 
combo lists of elements to link to project.
 2015-06-30 00:48:21 +02:00
sebhm
84e51eff3c add hook addMoreActionsButtons 
as in most Card, this hook is useful
 2015-06-29 22:36:41 +02:00
aspangaro
a762910f11 Add getNomUrl on accounting for account 2015-06-29 21:16:30 +02:00
Laurent Destailleur
5f07c18e06 NEW Add opportunity amount on project card. 2015-06-29 16:57:32 +02:00
aspangaro
7e54840cb6 Replace tabs with spaces 2015-06-29 13:12:37 +02:00
aspangaro
279d1d4320 Correct travis 2015-06-29 12:59:55 +02:00
Laurent Destailleur
9d1ca52492 Css fix 2015-06-29 11:22:03 +02:00
aspangaro
cb0aa41386 Debug 2015-06-29 06:48:39 +02:00
aspangaro
768042513d Merge remote-tracking branch 'Upstream/develop' into develop-42 2015-06-29 06:45:24 +02:00
aspangaro
cff82a5226 Use ref instead of rowid for expense report 2015-06-29 06:41:24 +02:00
Laurent Destailleur
dc050d39eb Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/adherents/type.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/js/lib_batch.js
	htdocs/core/modules/modUser.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/societe/consumption.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
	htdocs/user/perms.php
 2015-06-29 00:09:28 +02:00
Laurent Destailleur
6fb53ecb97 Update doc 2015-06-28 23:33:03 +02:00
Laurent Destailleur
9c99cae911 FIX XSS security using the onerror and missing escapement on type of 
member page.
 2015-06-28 23:32:38 +02:00
Laurent Destailleur
f8085c8ae6 Update doc 2015-06-28 12:34:21 +02:00
Laurent Destailleur
ce6039f7f6 NEW Replace category edition page on members with new select2 component. 2015-06-27 23:01:05 +02:00
Laurent Destailleur
b25d2ff00a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/main.inc.php
 2015-06-27 22:00:56 +02:00
Laurent Destailleur
0cbf92c716 Merge pull request #3110 from hregis/develop_strict 
Fix: Use hooks (Multicompany)
 2015-06-27 21:56:36 +02:00
Laurent Destailleur
0a2bafaa6d The trigger USER_LOGIN* are deprecated. They are still working but you 
should prefer use the hook afterLogin or afterLoginFailed instead.
 2015-06-27 21:52:23 +02:00
Laurent Destailleur
9d7806f1f4 Tag class as deprecated 2015-06-27 21:26:05 +02:00
Laurent Destailleur
a220a8696d Merge pull request #3111 from hregis/3.7_photos 
Fix: change encrypt/decrypt method for avoid division by zero
 2015-06-27 21:13:17 +02:00
Regis Houssin
5efea745a1 Fix: Public method name must not be prefixed with an underscore 2015-06-27 20:38:11 +02:00
Regis Houssin
5ac292f9ae Fix: Private member variable must be prefixed with an underscore 2015-06-27 20:32:19 +02:00