Commit Graph

51594 Commits

Author SHA1 Message Date
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
1548be2614 Merge pull request #4549 from FHenry/3.9
Accountancy module
2016-02-02 17:15:01 +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
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
687afeaffe FIX No project fields if module disabled 2016-02-02 15:09:01 +01:00
Laurent Destailleur
43d165f985 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-02-02 13:02:10 +01:00
Laurent Destailleur
015f24e80a Fix php unit to work both with old and new setup 2016-02-02 13:01:19 +01:00
Florian HENRY
c1f084b448 Fix accountancy 2016-02-02 11:11:08 +01:00
Florian HENRY
2887eb8c70 fix accountancy 2016-02-02 11:02:58 +01:00
Florian HENRY
22ce2872ac Fix journal 2016-02-02 11:01:15 +01:00
Florian HENRY
564594c3d7 Fix accountancy 2016-02-02 10:58:12 +01:00
Florian HENRY
48b191b1ff Fix tuff into accountancy 2016-02-01 15:08:01 +01:00
Florian HENRY
65162ae8e9 Accountancy modules 2016-02-01 14:59:13 +01:00
Florian HENRY
165b553a79 Format code 2016-02-01 14:50:25 +01:00
Laurent Destailleur
f22373b70b Fix bad management of option MAIN_HTML_TITLE 2016-02-01 01:19:37 +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
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
d9e089256e Fix path to copyrighted files 2016-01-31 16:16:46 +01:00
aspangaro
2fa01a1754 Merge remote-tracking branch 'Upstream/3.9' into 3.9-p9 2016-01-31 07:33:57 +01:00
aspangaro
c77fda5128 New accountancy menu for auguria 2016-01-31 07:31:48 +01:00
Laurent Destailleur
9a87d2bee5 Fix phpcs 2016-01-30 16:28:48 +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
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
Laurent Destailleur
cc7d105d88 Fix height in mapping impot step 2016-01-30 15:07:22 +01:00
Laurent Destailleur
c6a6889d79 Merge pull request #4389 from aspangaro/3.9-p6
Fix: Some problems presentation on accountancy module
2016-01-30 13:04:22 +01:00
Laurent Destailleur
09a24b8dd8 Merge pull request #4496 from frederic34/patch-9
Text not initialized
2016-01-30 12:24:40 +01:00
Laurent Destailleur
3591f51918 Merge pull request #4480 from hregis/3.8_bug
Fix: for avoid conflict with "global $m" in memory.lib.php
2016-01-30 12:22:47 +01:00
Laurent Destailleur
b27e31b3ae Merge pull request #4483 from marcosgdf/bug-4440-3
Corrected typo of PR #4444
2016-01-30 12:20:50 +01:00
Laurent Destailleur
2e7d88dffb Merge pull request #4499 from fmarcet/3.7
FIX: Contrat card don't consider user permissions to show active/unactive service button
2016-01-30 12:12:42 +01:00
Laurent Destailleur
c77fcfd291 Merge pull request #4503 from fmarcet/3.9
FIX: Not returning the correct multilevel price
2016-01-30 12:05:32 +01:00
Laurent Destailleur
f79b1d06cb Merge pull request #4519 from FHenry/3.9
FIX : set column paid on expense report when expense is paid
2016-01-30 12:01:10 +01:00
Laurent Destailleur
e2d9989574 Merge pull request #4518 from FHenry/3.9_compta
3.9 compta
2016-01-30 12:00:20 +01:00
Laurent Destailleur
e574ebe34c Merge pull request #4514 from hregis/3.8_bug2
Fix: missing field "label"
2016-01-30 11:57:28 +01:00
Laurent Destailleur
f5a4b9db31 Merge pull request #4520 from atm-ph/fix_3.8_show_all_shipping_by_socid
FIX filter by socid if from customer card
2016-01-30 11:56:40 +01:00