lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
53,599 Commits 43 Branches 150 Tags 886 MiB
3eabcccdd9
Commit Graph

53599 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fappels
d1362951d7 Merge remote-tracking branch 'refs/remotes/upstream/3.8' into 3.8 2016-02-03 19:26:47 +01:00
phf
1b552a0b3b Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module 
Conflicts:
	htdocs/core/class/link.class.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-03 18:30:59 +01:00
fappels
22cfffe622 Merge remote-tracking branch 'refs/remotes/upstream/develop' into develop 2016-02-03 17:20:38 +01:00
fappels
9b009ab535 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2016-02-03 17:16:03 +01:00
abcnet-lu
d430676e51 [Close] [#4558] Add districts and cantons for Luxembourg 2016-02-03 12:14:26 +01:00
fmarcet
6260c1ae9e FIX: Check stock of batch on shippment 2016-02-03 11:33:13 +01:00
abcnet-lu
d65ee22529 [Close] [#4555] Update label of intermediary VAT rate for Luxembourg (fix inverted labels) 2016-02-03 09:27:48 +01:00
abcnet-lu
a6ab581683 Merge pull request #1 from Dolibarr/develop 
Update my fork from original
 2016-02-03 08:55:50 +01:00
Laurent Destailleur
47e2e33fb7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/menus/init_menu_auguria.sql
 2016-02-03 03:27:17 +01:00
Laurent Destailleur
19300a2d82 Fix warning when javascript disabled 2016-02-03 03:10:58 +01:00
Laurent Destailleur
f4d04b8f26 FIX part of #4227 2016-02-03 02:41:07 +01:00
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
e22664b8cf FIX #4528 2016-02-03 01:01:14 +01:00
PeartreeG
ea5b8a409c little forget... 2016-02-02 18:37:54 +01:00
PeartreeG
cc8af4fba1 Update llx_element_resources.sql 2016-02-02 18:05:24 +01:00
PeartreeG
b0579cc39b Update 3.9.0-4.0.0.sql 2016-02-02 18:05:00 +01:00
Laurent Destailleur
6fcf2fb35a Better log 2016-02-02 17:27:34 +01:00
Laurent Destailleur
547ffd7fcc Add missing phpunit tests 2016-02-02 17:26:14 +01:00
Laurent Destailleur
24818ae2e3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-02-02 17:20:03 +01:00
Laurent Destailleur
cd72e606d0 Update travis 2016-02-02 17:19:28 +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
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
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
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
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
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
687afeaffe FIX No project fields if module disabled 2016-02-02 15:09:01 +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
PeartreeG
835c2725c5 Update element_resource.php 2016-02-02 14:14:01 +01:00
PeartreeG
4c0f29d234 Update fichinter.lib.php 2016-02-02 14:05:58 +01:00
PeartreeG
6bb6e66e13 element name used to create the clas... 2016-02-02 14:05:35 +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
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
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