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

51840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Laurent Destailleur
42b23876fd Merge pull request #4517 from FHenry/develop 
Accountancy module AND Accoutancy report
 2016-02-02 14:40:41 +01:00
Florian HENRY
0ac7c364f9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-02-02 13:36:22 +01:00
Laurent Destailleur
dcff643fb6 We don't want to exit if error on phpunit 2016-02-02 13:06:46 +01:00
Laurent Destailleur
cd16784b2b Another travis test 2016-02-02 13:05:26 +01:00
Laurent Destailleur
a67f52e491 Fix php unit to work both with old and new setup 2016-02-02 13:00:30 +01:00
Laurent Destailleur
1d9acd6a24 Debug 2016-02-02 12:53:45 +01:00
Florian HENRY
9298f167a7 Fix Travis 2016-02-02 12:32:25 +01:00
Florian HENRY
3c94f5d4d4 Add log into next values 2016-02-02 11:38:32 +01:00
Florian HENRY
eb7b71e3ab Fix accountancy 2016-02-02 11:10:38 +01:00
abcnet-lu
a196e163e0 [Close] [#4555] Update label of intermediary VAT rate for Luxembourg (fix spaces) 2016-02-02 09:32:38 +01:00
abcnet-lu
755758dd7a [Close] [#4555] Update label of intermediary VAT rate for Luxembourg 2016-02-02 09:28:45 +01:00
bosseal
fb7e1adad7 [Close] [#4553] Update VAT rates for Luxembourg (as they changed in 2015) 2016-02-02 08:23:46 +01:00
Florian HENRY
fb5aba6de2 Accountancy 2016-02-01 15:07:12 +01:00
Florian HENRY
72b0f62089 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-02-01 15:00:09 +01:00
Laurent Destailleur
de1c6cce63 Update doc 2016-02-01 10:42:53 +01:00
Laurent Destailleur
cd7ae52f92 Add log 2016-02-01 03:53:21 +01:00
Laurent Destailleur
64514b38da Merge remote-tracking branch 'origin/3.9' into develop 2016-02-01 01:23:41 +01:00
Laurent Destailleur
f22373b70b Fix bad management of option MAIN_HTML_TITLE 2016-02-01 01:19:37 +01:00
Laurent Destailleur
e9256913b1 Fix set INVOICE_CAN_ALWAYS_BE_REMOVED to have phpunit test ok 2016-01-31 21:32:15 +01:00
Laurent Destailleur
c54ebfebb5 Merge remote-tracking branch 'origin/3.9' into develop 2016-01-31 21:28:14 +01:00
Laurent Destailleur
605c36de65 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-01-31 21:27:46 +01:00
Laurent Destailleur
b93170b345 Merge remote-tracking branch 'origin/3.7' into 3.8 2016-01-31 21:27:20 +01:00
Laurent Destailleur
0076512d5b Merge remote-tracking branch 'origin/3.6' into 3.7 2016-01-31 21:26:52 +01:00
Laurent Destailleur
1b23ede857 Merge remote-tracking branch 'origin/3.5' into 3.6 2016-01-31 21:26:28 +01:00
Laurent Destailleur
640adcc666 Missing translation 2016-01-31 21:23:30 +01:00
Laurent Destailleur
b11fe5f4c7 Update debian doc 2016-01-31 20:46:27 +01:00
Laurent Destailleur
2d0c823ffe Fix bad transaction level due to code of situation invoices 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2016-01-31 20:45:06 +01:00
Laurent Destailleur
7b15ac1179 Fix bad transaction level due to code of situation invoices 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2016-01-31 20:44:09 +01:00
Laurent Destailleur
0e1bb06d01 Fix duplicate set 2016-01-31 20:41:35 +01:00
Laurent Destailleur
6002adb04c Fix bad transaction level due to code of situation invoices 2016-01-31 20:38:11 +01:00
Laurent Destailleur
d9e089256e Fix path to copyrighted files 2016-01-31 16:16:46 +01:00
Laurent Destailleur
475cc24e13 NEW Can edit next execution date of a cron job. 2016-01-31 15:37:23 +01:00
Laurent Destailleur
2cde6f39ff Missing error message 2016-01-31 15:16:45 +01:00
Laurent Destailleur
928336c835 NEW Clean and enhance code for cron engine 2016-01-31 15:14:50 +01:00
Laurent Destailleur
426e9297ea Prepare code to match cron rule: 0 if ok, !=0 if error 2016-01-31 14:20:02 +01:00
Laurent Destailleur
26cd0ac0c6 Fix duplicate field 2016-01-31 13:19:08 +01:00
aspangaro
6a12cdc876 New: Add User accountancy code in export 2016-01-31 08:18:47 +01:00
Florian HENRY
7d374c2b02 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/core/class/link.class.php
 2016-01-30 17:32:01 +01:00
Laurent Destailleur
71edb3f061 Fix phpcs 2016-01-30 16:57:00 +01:00
Bahfir Abbes
2a1ab9a8d4 Update card.php 
delete empty row in select list of vats in expenses as this value is not accepted
 2016-01-30 16:43:35 +01:00
Laurent Destailleur
67dbb1571c Merge remote-tracking branch 'origin/3.9' into develop 2016-01-30 16:29:20 +01:00
Laurent Destailleur
9a87d2bee5 Fix phpcs 2016-01-30 16:28:48 +01:00
Laurent Destailleur
a31e035bc6 Add more explanation on late definition 2016-01-30 16:19:49 +01:00
Laurent Destailleur
e3a4124a58 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/fr_FR/bills.lang
 2016-01-30 16:13:06 +01:00
Laurent Destailleur
5e9fd25a6e Merge remote-tracking branch 'origin/3.8' into 3.9 2016-01-30 15:59:40 +01:00
Laurent Destailleur
dfd4d36bdf Merge remote-tracking branch 'origin/3.7' into 3.8 2016-01-30 15:58:11 +01:00