Commit Graph

44708 Commits

Author SHA1 Message Date
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
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
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
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
abb
3bcfe849a1 fix:remove project info in standard document model for expense reports when project module is disabled 2016-01-31 22:35:09 +01:00
Laurent Destailleur
c54ebfebb5 Merge remote-tracking branch 'origin/3.9' into develop 2016-01-31 21:28:14 +01:00
Laurent Destailleur
640adcc666 Missing translation 2016-01-31 21:23:30 +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
abb
773ee5c0ea provide link section in expenses and add option for intervention 2016-01-31 19:59:47 +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
BENKE Charlie
d75a20c589 bad id on restricted aera 2016-01-30 17:30:06 +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
Laurent Destailleur
c9661ee20e Merge remote-tracking branch 'origin/3.6' into 3.7 2016-01-30 15:57:09 +01:00
Laurent Destailleur
129f5aad8e Fix bad translation 2016-01-30 15:56:04 +01:00
mic9p
8faeac611a Do not select siren but tva_intra from societe
VAT report by customer shows an empty field.
2016-01-30 15:35:28 +01:00
Laurent Destailleur
6e69e99227 FIX VAT Rate was not visible in log of old price list 2016-01-30 15:34:06 +01:00
Laurent Destailleur
83b297a9b2 FIX VAT Rate was not visible in log of old price list 2016-01-30 15:33:11 +01:00
Laurent Destailleur
5212303208 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-30 15:29:52 +01:00
Laurent Destailleur
d21908755e FIX Import/Export NPR VAT 2016-01-30 15:29:35 +01:00